dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #102469 from zimbatm/staging-nss-fixup

Browse Source 
Staging nss fixup
This commit is contained in:
Florian Klink 2020-11-02 12:21:30 +01:00 committed by GitHub
commit 75c5e594a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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;
nss = if isCross then buildPackages.nss.tools else "$out";
in
(stdenv.lib.optionalString enableFIPS ''
(stdenv.lib.optionalString enableFIPS (''
for libname in freebl3 nssdbm3 softokn3
do '' +
(if stdenv.isDarwin
@ -147,7 +147,7 @@ in stdenv.mkDerivation rec {
'') + ''
${nss}/bin/shlibsign -v -i "$libfile"
done
'') +
'')) +
''
moveToOutput bin "$tools"
moveToOutput bin/nss-config "$dev"