diff options
author | Rok Garbas <rok@garbas.si> | 2017-06-08 15:33:24 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-08 15:33:24 +0200 |
commit | a0afc4f0d19a0e5f18d2bb5729a40b4dd0d00da8 (patch) | |
tree | e44d4325e4a724b84c64366f723bc70c76b18ca0 /pkgs/applications/networking/browsers/firefox-bin/default.nix | |
parent | 340b3148c6fea8c5aedd1bd80d5d17f8aeca3d9e (diff) | |
download | nixpkgs-a0afc4f0d19a0e5f18d2bb5729a40b4dd0d00da8.tar nixpkgs-a0afc4f0d19a0e5f18d2bb5729a40b4dd0d00da8.tar.gz nixpkgs-a0afc4f0d19a0e5f18d2bb5729a40b4dd0d00da8.tar.bz2 nixpkgs-a0afc4f0d19a0e5f18d2bb5729a40b4dd0d00da8.tar.lz nixpkgs-a0afc4f0d19a0e5f18d2bb5729a40b4dd0d00da8.tar.xz nixpkgs-a0afc4f0d19a0e5f18d2bb5729a40b4dd0d00da8.tar.zst nixpkgs-a0afc4f0d19a0e5f18d2bb5729a40b4dd0d00da8.zip |
firefox-*-bin: updates (#26462)
* firefox-beta-bin: 51.0b8 -> 54.0b13 * firefox-devedition-bin: init at 54.0b14 Firefox DevEdition became a new product of Mozilla and is "repackaged" Firefox Beta with its own release channel and six weeks release cycle as other channels. It is no longer being built on nightly basis * updated the update.nix script to facilitata firefox-devedition-bin * disabling automatic updates by pointing to non existing channel * f firefoxWrapper looks for gtk3 attribute to wrap the executable gtk3 to wrap the binary with needed ``XDG_DATA_DIRS``
Diffstat (limited to 'pkgs/applications/networking/browsers/firefox-bin/default.nix')
-rw-r--r-- | pkgs/applications/networking/browsers/firefox-bin/default.nix | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index b6e8ac10fc9..dcb25dc1343 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -37,7 +37,8 @@ , libheimdal , libpulseaudio , systemd -, generated ? import ./sources.nix +, channel +, generated , writeScript , xidel , coreutils @@ -68,7 +69,7 @@ let source = stdenv.lib.findFirst (sourceMatches systemLocale) defaultSource sources; - name = "firefox-bin-unwrapped-${version}"; + name = "firefox-${channel}-bin-unwrapped-${version}"; in @@ -124,6 +125,8 @@ stdenv.mkDerivation { stdenv.cc.cc ]; + inherit gtk3; + buildInputs = [ wrapGAppsHook gtk3 defaultIconTheme ]; # "strip" after "patchelf" may break binaries. @@ -131,6 +134,11 @@ stdenv.mkDerivation { dontStrip = true; 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 + ''; + installPhase = '' mkdir -p "$prefix/usr/lib/firefox-bin-${version}" @@ -161,7 +169,7 @@ stdenv.mkDerivation { passthru.ffmpegSupport = true; passthru.updateScript = import ./update.nix { - inherit name writeScript xidel coreutils gnused gnugrep gnupg curl; + inherit name channel writeScript xidel coreutils gnused gnugrep gnupg curl; }; meta = with stdenv.lib; { description = "Mozilla Firefox, free web browser (binary package)"; |