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

firefox-wrapper: Get rid of name argument

Browse Source 
Only pname + version is supported now. (Both are still optional,
however.)
This commit is contained in:
John Ericson 2019-11-24 17:27:45 +00:00
parent d0d5136cce
commit d34d84a61d
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/networking/browsers/firefox/wrapper.nix
View File

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

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

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