Skip to content

Commit 674764c

Browse files
committed
firefox_decrypt: remove all-packages.nix override of by-name definition
1 parent 9d18042 commit 674764c

2 files changed

Lines changed: 5 additions & 7 deletions

File tree

pkgs/by-name/fi/firefox_decrypt/package.nix

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
lib,
33
fetchFromGitHub,
4-
nss,
4+
nss_latest,
55
nixosTests,
66
nix-update-script,
77
stdenv,
@@ -30,16 +30,16 @@ python3Packages.buildPythonApplication (finalAttrs: {
3030
"--prefix"
3131
(if stdenv.hostPlatform.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH")
3232
":"
33-
(lib.makeLibraryPath [ nss ])
33+
(lib.makeLibraryPath [ nss_latest ])
3434
];
3535

3636
checkPhase = ''
3737
runHook preCheck
3838
3939
patchShebangs tests
40-
(cd tests && ${
41-
if stdenv.hostPlatform.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"
42-
}=${lib.makeLibraryPath [ nss ]} ./run_all)
40+
(cd tests && ${if stdenv.hostPlatform.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"}=${
41+
lib.makeLibraryPath [ nss_latest ]
42+
} ./run_all)
4343
4444
runHook postCheck
4545
'';

pkgs/top-level/all-packages.nix

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6344,8 +6344,6 @@ with pkgs;
63446344
fmt_12
63456345
;
63466346

6347-
firefox_decrypt = callPackage ../by-name/fi/firefox_decrypt/package.nix { nss = nss_latest; };
6348-
63496347
fmt = fmt_12;
63506348

63516349
fontconfig = callPackage ../development/libraries/fontconfig { };

0 commit comments

Comments
 (0)