public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

firefox-bin: fix channel patching

Browse Source 
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.
This commit is contained in:
zimbatm 2018-09-25 15:36:21 +01:00 committed by Rok Garbas
parent 3a6329db85
commit 6060940c24
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/networking/browsers/firefox-bin/default.nix
View File

@ -82,7 +82,7 @@ stdenv.mkDerivation {
src = fetchurl { inherit (source) url sha512; }; src = fetchurl { inherit (source) url sha512; };
phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; phases = [ "unpackPhase" "patchPhase" "installPhase" "fixupPhase" ];
libPath = stdenv.lib.makeLibraryPath libPath = stdenv.lib.makeLibraryPath
[ stdenv.cc.cc [ stdenv.cc.cc
@ -142,8 +142,8 @@ stdenv.mkDerivation {
dontPatchELF = true; dontPatchELF = true;
patchPhase = '' patchPhase = ''
sed -i -e '/^pref("app.update.channel",/d' defaults/pref/channel-prefs.js # Don't download updates from Mozilla directly
echo 'pref("app.update.channel", "non-existing-channel")' >> defaults/pref/channel-prefs.js echo 'pref("app.update.auto", "false");' >> defaults/pref/channel-prefs.js
''; '';
installPhase = installPhase =