diff options
| author | zimbatm <zimbatm@zimbatm.com> | 2018-09-25 15:36:21 +0100 |
|---|---|---|
| committer | Rok Garbas <rok@garbas.si> | 2018-09-25 16:48:07 +0200 |
| commit | 6060940c24da057225b214164078b0b70e205ff7 (patch) | |
| tree | 97332be0b25d991f8d8f0a520da1581d438cb37a /pkgs/applications/networking/browsers/firefox-bin/default.nix | |
| parent | 3a6329db85c0a8d9aa980c9c27aa3f0cd1daa52c (diff) | |
| download | nixpkgs-6060940c24da057225b214164078b0b70e205ff7.tar nixpkgs-6060940c24da057225b214164078b0b70e205ff7.tar.gz nixpkgs-6060940c24da057225b214164078b0b70e205ff7.tar.bz2 nixpkgs-6060940c24da057225b214164078b0b70e205ff7.tar.lz nixpkgs-6060940c24da057225b214164078b0b70e205ff7.tar.xz nixpkgs-6060940c24da057225b214164078b0b70e205ff7.tar.zst nixpkgs-6060940c24da057225b214164078b0b70e205ff7.zip | |
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.
Diffstat (limited to 'pkgs/applications/networking/browsers/firefox-bin/default.nix')
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox-bin/default.nix | 6 |
1 files 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 = |