Author: simons
Date: Fri Jul 8 23:11:38 2011
New Revision: 27681
URL: https://svn.nixos.org/websvn/nix/?rev=27681&sc=1
Log:
util-linux-ng: prepare expression for the addition of perl as a buildInput
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.
Modified:
nixpkgs/trunk/pkgs/os-specific/linux/util-linux-ng/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/os-specific/linux/util-linux-ng/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/util-linux-ng/default.nix Fri Jul
8 22:45:28 2011 (r27680)
+++ nixpkgs/trunk/pkgs/os-specific/linux/util-linux-ng/default.nix Fri Jul
8 23:11:38 2011 (r27681)
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ncurses ? null }:
+{ stdenv, fetchurl, ncurses ? null, perl ? null }:
stdenv.mkDerivation rec {
name = "util-linux-ng-2.18";
@@ -19,5 +19,6 @@
${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;
}
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Jul 8 22:45:28
2011 (r27680)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Jul 8 23:11:38
2011 (r27681)
@@ -5663,6 +5663,7 @@
utillinuxng = callPackage ../os-specific/linux/util-linux-ng {
ncurses = null;
+ perl = null;
};
utillinuxngCurses = utillinuxng.override {
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
