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

fixup! nss: make reproducible (#102156) 

Fixes a precedence issue from fe9f55907e

`lib.optionalString <cond> 'text' + 'text2'` will always have 'text2' as
part of the result.
This commit is contained in:
zimbatm 2020-11-02 11:54:40 +01:00
parent b7ef4d7dda
commit 5ff35fab0f
No known key found for this signature in database
GPG Key ID: 71BAF6D40C1D63D7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -134,7 +134,7 @@ in stdenv.mkDerivation rec {
isCross = stdenv.hostPlatform != stdenv.buildPlatform; isCross = stdenv.hostPlatform != stdenv.buildPlatform;
nss = if isCross then buildPackages.nss.tools else "$out"; nss = if isCross then buildPackages.nss.tools else "$out";
in in
(stdenv.lib.optionalString enableFIPS '' (stdenv.lib.optionalString enableFIPS (''
for libname in freebl3 nssdbm3 softokn3 for libname in freebl3 nssdbm3 softokn3
do '' + do '' +
(if stdenv.isDarwin (if stdenv.isDarwin
@ -147,7 +147,7 @@ in stdenv.mkDerivation rec {
'') + '' '') + ''
${nss}/bin/shlibsign -v -i "$libfile" ${nss}/bin/shlibsign -v -i "$libfile"
done done
'') + '')) +
'' ''
moveToOutput bin "$tools" moveToOutput bin "$tools"
moveToOutput bin/nss-config "$dev" moveToOutput bin/nss-config "$dev"