firefoxWrapper: Fix the name

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

View file

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

View file

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