diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-01-10 12:17:39 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-01-15 08:36:08 +0100 |
| commit | a8f1d40c1f495ef3388b73992d2079c13471b729 (patch) | |
| tree | 12d009cbb09867b27e7136bff093c5dfb266dc39 /pkgs/applications/networking | |
| parent | 95c1429e624f3ff85a301102511a2483cfdf61fc (diff) | |
| download | nixlib-a8f1d40c1f495ef3388b73992d2079c13471b729.tar nixlib-a8f1d40c1f495ef3388b73992d2079c13471b729.tar.gz nixlib-a8f1d40c1f495ef3388b73992d2079c13471b729.tar.bz2 nixlib-a8f1d40c1f495ef3388b73992d2079c13471b729.tar.lz nixlib-a8f1d40c1f495ef3388b73992d2079c13471b729.tar.xz nixlib-a8f1d40c1f495ef3388b73992d2079c13471b729.tar.zst nixlib-a8f1d40c1f495ef3388b73992d2079c13471b729.zip | |
all-packages: browserWrapper -> browser
- I chose to keep `browser-unwrapped` attributes so that it's much easier to override parameters for the browser (through `packageOverrides`). - Aliases `browserWrapper` are retained for now, as usual.
Diffstat (limited to 'pkgs/applications/networking')
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/networking/irc/chatzilla/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 80f5e7212c8c..5062688fffee 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -131,13 +131,13 @@ common = { pname, version, sha256 }: stdenv.mkDerivation rec { in { - firefox = common { + firefox-unwrapped = common { pname = "firefox"; version = "43.0.4"; sha256 = "0xjs4j26h8fyy8izrcc482vfvgg4gqzap5kh17jfv7flhn9akkvn"; }; - firefox-esr = common { + firefox-esr-unwrapped = common { pname = "firefox-esr"; version = "38.5.2esr"; sha256 = "0xqirpiys2pgzk9hs4s93svknc0sss8ry60zar7n9jj74cgz590m"; diff --git a/pkgs/applications/networking/irc/chatzilla/default.nix b/pkgs/applications/networking/irc/chatzilla/default.nix index 765066bb4371..82d9912192ed 100644 --- a/pkgs/applications/networking/irc/chatzilla/default.nix +++ b/pkgs/applications/networking/irc/chatzilla/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, firefox, makeWrapper }: +{ stdenv, fetchurl, unzip, firefox-unwrapped, makeWrapper }: stdenv.mkDerivation rec { name = "chatzilla-0.9.91"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { mkdir -p $out/libexec/chatzilla unzip $src -d $out/libexec/chatzilla - makeWrapper ${firefox}/bin/firefox $out/bin/chatzilla \ + makeWrapper ${firefox-unwrapped}/bin/firefox $out/bin/chatzilla \ --add-flags "-app $out/libexec/chatzilla/application.ini" sed -i $out/libexec/chatzilla/application.ini -e 's/.*MaxVersion.*/MaxVersion=99.*/' |