Dawoox/nixpkgs
1
1
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

* Use $propagatedBuildInputs to find build inputs.

Browse Source 
* Bug fix in setup.sh.

svn path=/nixpkgs/trunk/; revision=861
This commit is contained in:
Eelco Dolstra
2004-03-27 22:09:34 +00:00
parent bd56b7d65c
commit f45695f7fa
7 changed files with 22 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/libraries/freedesktop/libSM/builder.sh
View File

@@ -1,8 +1,3 @@
#! /bin/sh -e
. $stdenv/setup
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

4
pkgs/development/libraries/freedesktop/libSM/default.nix
View File

@@ -8,7 +8,7 @@ derivation {
url = http://freedesktop.org/~xlibs/release/xlibs-1.0/libSM-6.0.2.tar.bz2;
md5 = "0ecc3ec75391d9158f25a94a652bd387";
};
buildInputs = [pkgconfig libX11 libICE];
_propagatedBuildInputs = [libICE];
buildInputs = [pkgconfig];
propagatedBuildInputs = [libX11 libICE];
inherit stdenv;
}

9
pkgs/development/libraries/freedesktop/libX11/builder.sh
View File

@@ -1,10 +1,3 @@
#! /bin/sh
#! /bin/sh -e
. $stdenv/setup
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

4
pkgs/development/libraries/freedesktop/libX11/default.nix
View File

@@ -8,7 +8,7 @@ derivation {
url = http://freedesktop.org/~xlibs/release/xlibs-1.0/libX11-6.2.1.tar.bz2;
md5 = "59b6fa7cd6fe7ee1da92fd1b56d1cee3";
};
buildInputs = [pkgconfig xproto xextensions libXtrans libXau];
_propagatedBuildInputs = [xproto xextensions libXtrans libXau];
buildInputs = [pkgconfig];
propagatedBuildInputs = [xproto xextensions libXtrans libXau];
inherit stdenv;
}

8
pkgs/development/libraries/freedesktop/xlibs/builder.sh
View File

@@ -1,7 +1,5 @@
#! /bin/sh -e
. $stdenv/setup
mkdir $out
mkdir $out/nix-support
echo "$propagatedBuildInputs" > $out/nix-support/propagated-build-inputs
dontMake=1
dontMakeInstall=1
genericBuild