From 5ff35fab0fc8dbdbebe34f36c0830578856e7398 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Mon, 2 Nov 2020 11:54:40 +0100 Subject: [PATCH] fixup! nss: make reproducible (#102156) Fixes a precedence issue from fe9f55907e2a42b675e161de3d5e6a740385c479 `lib.optionalString 'text' + 'text2'` will always have 'text2' as part of the result. --- pkgs/development/libraries/nss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 0c51fda5382..c7c87a436b5 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -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"