* Use $propagatedBuildInputs to find build inputs.
* Bug fix in setup.sh. svn path=/nixpkgs/trunk/; revision=861
This commit is contained in:
parent
bd56b7d65c
commit
f45695f7fa
@ -1,6 +0,0 @@
|
|||||||
* Add $propagatedBuildInputs to $buildInputs in setup.sh. Then clean
|
|
||||||
up freedesktop/libX11/default.nix, libSM.
|
|
||||||
|
|
||||||
* In setup.sh: create $out prior to calling `make install'.
|
|
||||||
|
|
||||||
* In setup.sh: `mkdir -f' -> `if ! test -x $out/...; then mkdir ...'.
|
|
@ -1,8 +1,3 @@
|
|||||||
#! /bin/sh -e
|
#! /bin/sh -e
|
||||||
. $stdenv/setup
|
. $stdenv/setup
|
||||||
genericBuild
|
genericBuild
|
||||||
|
|
||||||
if test -n "$_propagatedBuildInputs"; then
|
|
||||||
if ! test -x $out/nix-support; then mkdir $out/nix-support; fi
|
|
||||||
echo "$_propagatedBuildInputs" > $out/nix-support/propagated-build-inputs
|
|
||||||
fi
|
|
||||||
|
@ -8,7 +8,7 @@ derivation {
|
|||||||
url = http://freedesktop.org/~xlibs/release/xlibs-1.0/libSM-6.0.2.tar.bz2;
|
url = http://freedesktop.org/~xlibs/release/xlibs-1.0/libSM-6.0.2.tar.bz2;
|
||||||
md5 = "0ecc3ec75391d9158f25a94a652bd387";
|
md5 = "0ecc3ec75391d9158f25a94a652bd387";
|
||||||
};
|
};
|
||||||
buildInputs = [pkgconfig libX11 libICE];
|
buildInputs = [pkgconfig];
|
||||||
_propagatedBuildInputs = [libICE];
|
propagatedBuildInputs = [libX11 libICE];
|
||||||
inherit stdenv;
|
inherit stdenv;
|
||||||
}
|
}
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
#! /bin/sh
|
#! /bin/sh -e
|
||||||
|
|
||||||
. $stdenv/setup
|
. $stdenv/setup
|
||||||
|
|
||||||
genericBuild
|
genericBuild
|
||||||
|
|
||||||
if test -n "$_propagatedBuildInputs"; then
|
|
||||||
if ! test -x $out/nix-support; then mkdir $out/nix-support; fi
|
|
||||||
echo "$_propagatedBuildInputs" > $out/nix-support/propagated-build-inputs
|
|
||||||
fi
|
|
||||||
|
@ -8,7 +8,7 @@ derivation {
|
|||||||
url = http://freedesktop.org/~xlibs/release/xlibs-1.0/libX11-6.2.1.tar.bz2;
|
url = http://freedesktop.org/~xlibs/release/xlibs-1.0/libX11-6.2.1.tar.bz2;
|
||||||
md5 = "59b6fa7cd6fe7ee1da92fd1b56d1cee3";
|
md5 = "59b6fa7cd6fe7ee1da92fd1b56d1cee3";
|
||||||
};
|
};
|
||||||
buildInputs = [pkgconfig xproto xextensions libXtrans libXau];
|
buildInputs = [pkgconfig];
|
||||||
_propagatedBuildInputs = [xproto xextensions libXtrans libXau];
|
propagatedBuildInputs = [xproto xextensions libXtrans libXau];
|
||||||
inherit stdenv;
|
inherit stdenv;
|
||||||
}
|
}
|
||||||
|
@ -1,7 +1,5 @@
|
|||||||
#! /bin/sh -e
|
#! /bin/sh -e
|
||||||
|
|
||||||
. $stdenv/setup
|
. $stdenv/setup
|
||||||
|
dontMake=1
|
||||||
mkdir $out
|
dontMakeInstall=1
|
||||||
mkdir $out/nix-support
|
genericBuild
|
||||||
echo "$propagatedBuildInputs" > $out/nix-support/propagated-build-inputs
|
|
||||||
|
@ -64,7 +64,7 @@ pkgs=""
|
|||||||
if test -n "$buildinputs"; then
|
if test -n "$buildinputs"; then
|
||||||
buildInputs="$buildinputs" # compatibility
|
buildInputs="$buildinputs" # compatibility
|
||||||
fi
|
fi
|
||||||
for i in $buildInputs; do
|
for i in $buildInputs $propagatedBuildInputs; do
|
||||||
findInputs $i
|
findInputs $i
|
||||||
done
|
done
|
||||||
|
|
||||||
@ -360,8 +360,10 @@ buildW() {
|
|||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "make flags: $makeFlags"
|
if test -z "$dontMake"; then
|
||||||
make $makeFlags
|
echo "make flags: $makeFlags"
|
||||||
|
make $makeFlags
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -381,16 +383,21 @@ installW() {
|
|||||||
if test -n "$preInstall"; then
|
if test -n "$preInstall"; then
|
||||||
$preInstall
|
$preInstall
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if ! test -x "$out"; then mkdir "$out"; fi
|
||||||
|
|
||||||
make install $installFlags
|
if test -z "$dontMakeInstall"; then
|
||||||
|
echo "install flags: $installFlags"
|
||||||
|
make install $installFlags
|
||||||
|
fi
|
||||||
|
|
||||||
if test -z "$dontStrip" -a "$NIX_STRIP_DEBUG" = 1; then
|
if test -z "$dontStrip" -a "$NIX_STRIP_DEBUG" = 1; then
|
||||||
find $out -name "*.a" -exec echo stripping {} \; -exec strip -S {} \;
|
find "$out" -name "*.a" -exec echo stripping {} \; -exec strip -S {} \;
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test -n "$propagatedBuildInputs"; then
|
if test -n "$propagatedBuildInputs"; then
|
||||||
mkdir -f $out/nix-support
|
if ! test -x "$out/nix-support"; then mkdir "$out/nix-support"; fi
|
||||||
echo "$propagatedBuildInputs" > $out/nix-support/propagated-build-inputs
|
echo "$propagatedBuildInputs" > "$out/nix-support/propagated-build-inputs"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test -n "$postInstall"; then
|
if test -n "$postInstall"; then
|
||||||
|
Loading…
Reference in New Issue
Block a user