From 674764cd03430c5cad5029cf76f379efc46e7c92 Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sat, 14 Mar 2026 22:39:29 -0400 Subject: [PATCH] firefox_decrypt: remove all-packages.nix override of by-name definition --- pkgs/by-name/fi/firefox_decrypt/package.nix | 10 +++++----- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/fi/firefox_decrypt/package.nix b/pkgs/by-name/fi/firefox_decrypt/package.nix index 12c46382888d..74b6c316de6c 100644 --- a/pkgs/by-name/fi/firefox_decrypt/package.nix +++ b/pkgs/by-name/fi/firefox_decrypt/package.nix @@ -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 ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2809581a6165..b1ce972691b2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { };