firefox_decrypt: remove all-packages.nix override of by-name definition
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
nss,
|
||||
nss_latest,
|
||||
nixosTests,
|
||||
nix-update-script,
|
||||
stdenv,
|
||||
@@ -30,16 +30,16 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
"--prefix"
|
||||
(if stdenv.hostPlatform.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH")
|
||||
":"
|
||||
(lib.makeLibraryPath [ nss ])
|
||||
(lib.makeLibraryPath [ nss_latest ])
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
patchShebangs tests
|
||||
(cd tests && ${
|
||||
if stdenv.hostPlatform.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"
|
||||
}=${lib.makeLibraryPath [ nss ]} ./run_all)
|
||||
(cd tests && ${if stdenv.hostPlatform.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"}=${
|
||||
lib.makeLibraryPath [ nss_latest ]
|
||||
} ./run_all)
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
@@ -6344,8 +6344,6 @@ with pkgs;
|
||||
fmt_12
|
||||
;
|
||||
|
||||
firefox_decrypt = callPackage ../by-name/fi/firefox_decrypt/package.nix { nss = nss_latest; };
|
||||
|
||||
fmt = fmt_12;
|
||||
|
||||
fontconfig = callPackage ../development/libraries/fontconfig { };
|
||||
|
||||
Reference in New Issue
Block a user