From 720e3518c5fa02195e94b1d1a5ced388e061c8e4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 8 Jul 2011 23:11:38 +0000
Subject: [PATCH] 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.

svn path=/nixpkgs/trunk/; revision=27681
---
 pkgs/os-specific/linux/util-linux-ng/default.nix | 5 +++--
 pkgs/top-level/all-packages.nix                  | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/util-linux-ng/default.nix b/pkgs/os-specific/linux/util-linux-ng/default.nix
index 2ae172c6c19..4e62be4ff32 100644
--- a/pkgs/os-specific/linux/util-linux-ng/default.nix
+++ b/pkgs/os-specific/linux/util-linux-ng/default.nix
@@ -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 @@ stdenv.mkDerivation rec {
     ${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;
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4d062421688..9f36d8a5d29 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5663,6 +5663,7 @@ let
 
   utillinuxng = callPackage ../os-specific/linux/util-linux-ng {
     ncurses = null;
+    perl = null;
   };
 
   utillinuxngCurses = utillinuxng.override {