From 6060940c24da057225b214164078b0b70e205ff7 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Tue, 25 Sep 2018 15:36:21 +0100 Subject: [PATCH] firefox-bin: fix channel patching The patchPhase wasn't being applied at all. This patch re-enables that and also re-thinks the setting that we want to have. Turning off the auto-update is more accurate and doesn't lose information like it did before. --- .../networking/browsers/firefox-bin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 7e92df163af..91aee7b1e8a 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation { src = fetchurl { inherit (source) url sha512; }; - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; + phases = [ "unpackPhase" "patchPhase" "installPhase" "fixupPhase" ]; libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc @@ -142,8 +142,8 @@ stdenv.mkDerivation { dontPatchELF = true; patchPhase = '' - sed -i -e '/^pref("app.update.channel",/d' defaults/pref/channel-prefs.js - echo 'pref("app.update.channel", "non-existing-channel")' >> defaults/pref/channel-prefs.js + # Don't download updates from Mozilla directly + echo 'pref("app.update.auto", "false");' >> defaults/pref/channel-prefs.js ''; installPhase =