actually link to zlib
svn path=/nixpkgs/trunk/; revision=5931
This commit is contained in:
parent
f644035715
commit
46d7a1ac7f
@ -1,6 +1,6 @@
|
|||||||
source $stdenv/setup
|
source $stdenv/setup
|
||||||
|
|
||||||
configureFlags=""
|
configureFlags="--with-zlib=$zlib"
|
||||||
if test "$pythonSupport"; then
|
if test "$pythonSupport"; then
|
||||||
configureFlags="--with-python=$python $configureFlags"
|
configureFlags="--with-python=$python $configureFlags"
|
||||||
fi
|
fi
|
||||||
|
@ -13,7 +13,7 @@ stdenv.mkDerivation {
|
|||||||
};
|
};
|
||||||
|
|
||||||
python = if pythonSupport then python else null;
|
python = if pythonSupport then python else null;
|
||||||
inherit pythonSupport;
|
inherit pythonSupport zlib;
|
||||||
|
|
||||||
buildInputs = if pythonSupport then [python] else [];
|
buildInputs = if pythonSupport then [python] else [];
|
||||||
propagatedBuildInputs = [zlib];
|
propagatedBuildInputs = [zlib];
|
||||||
|
@ -13,7 +13,7 @@ stdenv.mkDerivation {
|
|||||||
};
|
};
|
||||||
|
|
||||||
python = if pythonSupport then python else null;
|
python = if pythonSupport then python else null;
|
||||||
inherit pythonSupport;
|
inherit pythonSupport zlib;
|
||||||
|
|
||||||
buildInputs = if pythonSupport then [python] else [];
|
buildInputs = if pythonSupport then [python] else [];
|
||||||
propagatedBuildInputs = [zlib];
|
propagatedBuildInputs = [zlib];
|
||||||
|
Loading…
x
Reference in New Issue
Block a user