diff options
author | aszlig <aszlig@redmoonstudios.org> | 2012-08-22 04:24:44 +0200 |
---|---|---|
committer | aszlig <aszlig@redmoonstudios.org> | 2012-08-22 08:29:10 +0200 |
commit | 808108105dd62421effebe3dbadf2183e7668be2 (patch) | |
tree | 3d579b7b4e7ed70df3a77fe4a9ef5d09eb07fb70 /pkgs/development/libraries/nss | |
parent | c672997dc6671e74b3256bd4d0b905afb4d9b8b9 (diff) | |
download | nixlib-808108105dd62421effebe3dbadf2183e7668be2.tar nixlib-808108105dd62421effebe3dbadf2183e7668be2.tar.gz nixlib-808108105dd62421effebe3dbadf2183e7668be2.tar.bz2 nixlib-808108105dd62421effebe3dbadf2183e7668be2.tar.lz nixlib-808108105dd62421effebe3dbadf2183e7668be2.tar.xz nixlib-808108105dd62421effebe3dbadf2183e7668be2.tar.zst nixlib-808108105dd62421effebe3dbadf2183e7668be2.zip |
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.
Diffstat (limited to 'pkgs/development/libraries/nss')
-rw-r--r-- | pkgs/development/libraries/nss/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
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 \) ''; } |