pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #210137 from helsinki-systems/upd/nss

authored by

Martin Weinelt and committed by
GitHub 9653817e 3c782a80

+10 -7
unified split
+2 -2
pkgs/development/libraries/nss/esr.nix
··· 1 import ./generic.nix { 2 - version = "3.79.2"; 3 - hash = "sha256-hwcHDI74CgYp2vhQyKspKQ6T/O55f6g/cZvb9z1np4E="; 4 }
··· 1 import ./generic.nix { 2 + version = "3.79.3"; 3 + hash = "sha256-8fhrlMe832xWYTYVMnZE7MV20W8sMX+5hHDcAcWYSA4="; 4 }
+8 -5
pkgs/development/libraries/nss/generic.nix
··· 103 runHook postBuild 104 ''; 105 106 - NIX_CFLAGS_COMPILE = 107 - "-Wno-error -DNIX_NSS_LIBDIR=\"${placeholder "out"}/lib/\" " 108 - + lib.optionalString stdenv.hostPlatform.is64bit "-DNSS_USE_64=1" 109 - + lib.optionalString stdenv.hostPlatform.isILP32 " -DNS_PTR_LE_32=1" # See RNG_RandomUpdate() in drdbg.c 110 - ; 111 112 installPhase = '' 113 runHook preInstall
··· 103 runHook postBuild 104 ''; 105 106 + NIX_CFLAGS_COMPILE = [ 107 + "-Wno-error" 108 + "-DNIX_NSS_LIBDIR=\"${placeholder "out"}/lib/\"" 109 + ] ++ lib.optionals stdenv.hostPlatform.is64bit [ 110 + "-DNSS_USE_64=1" 111 + ] ++ lib.optionals stdenv.hostPlatform.isILP32 [ 112 + "-DNS_PTR_LE_32=1" # See RNG_RandomUpdate() in drdbg.c 113 + ]; 114 115 installPhase = '' 116 runHook preInstall