util-linux-ng failed to build without zlib.
svn path=/nixpkgs/branches/stdenv-updates/; revision=28955
This commit is contained in:
parent
d11c7b604f
commit
9c37762551
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, fetchurl, ncurses ? null, perl ? null }:
|
{ stdenv, fetchurl, zlib, ncurses ? null, perl ? null }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "util-linux-ng-2.18";
|
name = "util-linux-ng-2.18";
|
||||||
|
@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
|
||||||
${if ncurses == null then "--without-ncurses" else ""}
|
${if ncurses == null then "--without-ncurses" else ""}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
buildInputs = stdenv.lib.optional (ncurses != null) ncurses
|
buildInputs = [ zlib ] ++ stdenv.lib.optional (ncurses != null) ncurses
|
||||||
++ stdenv.lib.optional (perl != null) perl;
|
++ stdenv.lib.optional (perl != null) perl;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue