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

firefox-bin: wrap firefox-bin (close #12416)

Browse Source
This commit is contained in:
taku0 2016-01-16 16:11:04 +09:00 committed by Vladimír Čunát
parent 1a4ab04e29
commit fba7544812
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,7 +60,7 @@ let
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "firefox-bin-${version}"; name = "firefox-bin-unwrapped-${version}";
src = fetchurl { src = fetchurl {
url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/${version}/${source.arch}/${source.locale}/firefox-${version}.tar.bz2"; url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/${version}/${source.arch}/${source.locale}/firefox-${version}.tar.bz2";

9
pkgs/top-level/all-packages.nix
View File

@ -11864,11 +11864,18 @@ let
firefox = wrapFirefox firefox-unwrapped { }; firefox = wrapFirefox firefox-unwrapped { };
firefox-esr = wrapFirefox firefox-esr-unwrapped { }; firefox-esr = wrapFirefox firefox-esr-unwrapped { };
firefox-bin = callPackage ../applications/networking/browsers/firefox-bin { firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin {
gconf = pkgs.gnome.GConf; gconf = pkgs.gnome.GConf;
inherit (pkgs.gnome) libgnome libgnomeui; inherit (pkgs.gnome) libgnome libgnomeui;
}; };
firefox-bin = wrapFirefox firefox-bin-unwrapped {
browserName = "firefox";
name = "firefox-bin-" +
(builtins.parseDrvName firefox-bin-unwrapped.name).version;
desktopName = "Firefox";
};
firestr = qt5.callPackage ../applications/networking/p2p/firestr firestr = qt5.callPackage ../applications/networking/p2p/firestr
{ boost = boost155; { boost = boost155;
}; };