From 599648bf3bae972f4b18bc4c58f50d742c0d8170 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 14 Jun 2008 10:14:36 +0000 Subject: [PATCH] * module-init-tools: the shebang patch change caused bash and glibc to end up in the closure of the dietlibc build of module-init-tools, which is bad for the initrd. svn path=/nixpkgs/trunk/; revision=12086 --- pkgs/os-specific/linux/module-init-tools/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/module-init-tools/default.nix b/pkgs/os-specific/linux/module-init-tools/default.nix index 47f45d8fb4c..349280fc055 100644 --- a/pkgs/os-specific/linux/module-init-tools/default.nix +++ b/pkgs/os-specific/linux/module-init-tools/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl}: -stdenv.mkDerivation { +stdenv.mkDerivation ({ name = "module-init-tools-3.2.2"; src = fetchurl { url = mirror://kernel/linux/utils/kernel/module-init-tools/module-init-tools-3.2.2.tar.bz2; @@ -8,4 +8,8 @@ stdenv.mkDerivation { }; patches = [./module-dir.patch]; postInstall = "rm $out/sbin/insmod.static"; # don't need it -} +} // (if stdenv ? isDietLibC then { + # We don't want bash (and therefore glibc) in the closure of the + # output, since we want to put this in a initrd. + dontPatchShebangs = true; +} else {}))