firefox-wrapper: Get rid of name argument

Only pname + version is supported now. (Both are still optional,
however.)
wip/yesman
John Ericson 5 years ago
parent d0d5136cce
commit d34d84a61d
  1. 5
      pkgs/applications/networking/browsers/firefox/wrapper.nix
  2. 3
      pkgs/top-level/all-packages.nix

@ -19,9 +19,8 @@ browser:
let
wrapper =
{ browserName ? browser.browserName or (lib.getName browser)
, name ? browserName + "-" + lib.getVersion browser # TODO delete, it's just for compat
, pname ? lib.getName name
, version ? lib.getVersion name
, pname ? browserName
, version ? lib.getVersion browser
, desktopName ? # browserName with first letter capitalized
(lib.toUpper (lib.substring 0 1 browserName) + lib.substring 1 (-1) browserName)
, nameSuffix ? ""

@ -18867,7 +18867,6 @@ in
firefox-bin = wrapFirefox firefox-bin-unwrapped {
browserName = "firefox";
pname = "firefox-bin";
version = lib.getVersion firefox-bin-unwrapped;
desktopName = "Firefox";
};
@ -18881,7 +18880,6 @@ in
firefox-beta-bin = res.wrapFirefox firefox-beta-bin-unwrapped {
browserName = "firefox";
pname = "firefox-beta-bin";
version = lib.getVersion firefox-beta-bin-unwrapped;
desktopName = "Firefox Beta";
};
@ -18896,7 +18894,6 @@ in
browserName = "firefox";
nameSuffix = "-devedition";
pname = "firefox-devedition-bin";
version = lib.getVersion firefox-devedition-bin-unwrapped;
desktopName = "Firefox DevEdition";
};

Loading…
Cancel
Save