Unverified Commit b0a4eaad authored by Michael Daniels's avatar Michael Daniels Committed by GitHub
Browse files

firefox_decrypt: remove all-packages.nix override of by-name definition (#499971)

parents fd456de2 674764cd

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

+5 −5
Original line number Diff line number Diff line 
{

  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

  '';

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -6320,8 +6320,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 { };