mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-17 08:28:20 +00:00
Code Issues Wiki Activity

firefoxWrapper: Fix the name

Browse source
This commit is contained in:
Eelco Dolstra 2014-03-10 15:18:48 +01:00
parent e167cf9f21
commit 203f4d6ec8
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/networking/browsers/firefox/wrapper.nix
View file

@ -2,8 +2,10 @@
, browserName, desktopName, nameSuffix, icon , browserName, desktopName, nameSuffix, icon
}: }:
let p = builtins.parseDrvName browser.name; in
stdenv.mkDerivation { stdenv.mkDerivation {
name = browser.name + "-with-plugins"; name = "${p.name}-with-plugins-${p.version}";
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
name = browserName; name = browserName;

3
pkgs/top-level/all-packages.nix
View file

@ -7633,6 +7633,7 @@ let
comical = callPackage ../applications/graphics/comical { }; comical = callPackage ../applications/graphics/comical { };
conkeror = callPackage ../applications/networking/browsers/conkeror { }; conkeror = callPackage ../applications/networking/browsers/conkeror { };
conkerorWrapper = wrapFirefox { conkerorWrapper = wrapFirefox {
browser = conkeror; browser = conkeror;
browserName = "conkeror"; browserName = "conkeror";
@ -7993,7 +7994,7 @@ let
inherit (gnome) libIDL; inherit (gnome) libIDL;
}; };
firefox13Wrapper = lowPrio (wrapFirefox { browser = firefox13Pkgs.firefox; }); firefox13Wrapper = wrapFirefox { browser = firefox13Pkgs.firefox; };
firefoxPkgs = callPackage ../applications/networking/browsers/firefox { firefoxPkgs = callPackage ../applications/networking/browsers/firefox {
inherit (gnome) libIDL; inherit (gnome) libIDL;