From 808108105dd62421effebe3dbadf2183e7668be2 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 22 Aug 2012 04:24:44 +0200 Subject: [PATCH] nss: Just delete files if includeTools is false. Before, the entire directory was deleted and recreated, which fails if we want to sign libraries (shlibsign is obviously deleted in that step as well), so we delete everything but "nss-config" on postFixup. --- pkgs/development/libraries/nss/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 414e66864c17..38e9d80d5b71 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -65,7 +65,6 @@ in stdenv.mkDerivation rec { mv $out/public $out/include mv $out/*.OBJ/* $out/ rmdir $out/*.OBJ - ${if includeTools then "" else "rm -rf $out/bin; mkdir $out/bin"} cp -av config/nss-config $out/bin/nss-config ''; @@ -76,5 +75,7 @@ in stdenv.mkDerivation rec { libfile="$out/lib/lib$libname.so" LD_LIBRARY_PATH=$out/lib $out/bin/shlibsign -v -i "$libfile" done + '' + stdenv.lib.optionalString (!includeTools) '' + find $out/bin -type f \( -name nss-config -o -delete \) ''; }