public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nss: Just delete files if includeTools is false.

Browse Source 
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.
This commit is contained in:
aszlig 2012-08-22 04:24:44 +02:00
parent c672997dc6
commit 808108105d
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/libraries/nss/default.nix
View File

@ -65,7 +65,6 @@ in stdenv.mkDerivation rec {
mv $out/public $out/include mv $out/public $out/include
mv $out/*.OBJ/* $out/ mv $out/*.OBJ/* $out/
rmdir $out/*.OBJ rmdir $out/*.OBJ
${if includeTools then "" else "rm -rf $out/bin; mkdir $out/bin"}
cp -av config/nss-config $out/bin/nss-config cp -av config/nss-config $out/bin/nss-config
''; '';
@ -76,5 +75,7 @@ in stdenv.mkDerivation rec {
libfile="$out/lib/lib$libname.so" libfile="$out/lib/lib$libname.so"
LD_LIBRARY_PATH=$out/lib $out/bin/shlibsign -v -i "$libfile" LD_LIBRARY_PATH=$out/lib $out/bin/shlibsign -v -i "$libfile"
done done
'' + stdenv.lib.optionalString (!includeTools) ''
find $out/bin -type f \( -name nss-config -o -delete \)
''; '';
} }