public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

util-linux-ng: prepare expression for the addition of perl as a buildInput

Browse Source 
The chkdupexe utility requires perl. We cannot change the expression, though,
without triggering a re-build of almost all of stdenv, so for the time being
I'm making Perl an optional build input that is disabled by default.

svn path=/nixpkgs/trunk/; revision=27681
This commit is contained in:
Peter Simons 2011-07-08 23:11:38 +00:00
parent f15dca4c9c
commit 720e3518c5
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/os-specific/linux/util-linux-ng/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ncurses ? null }: { stdenv, fetchurl, ncurses ? null, perl ? null }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "util-linux-ng-2.18"; name = "util-linux-ng-2.18";
@ -19,5 +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 = stdenv.lib.optional (ncurses != null) ncurses
++ stdenv.lib.optional (perl != null) perl;
} }

1
pkgs/top-level/all-packages.nix
View File

@ -5663,6 +5663,7 @@ let
utillinuxng = callPackage ../os-specific/linux/util-linux-ng { utillinuxng = callPackage ../os-specific/linux/util-linux-ng {
ncurses = null; ncurses = null;
perl = null;
}; };
utillinuxngCurses = utillinuxng.override { utillinuxngCurses = utillinuxng.override {