diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2019-11-24 17:27:45 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2019-11-24 17:27:45 +0000 |
| commit | d34d84a61da7cf332e470b65ab05f2d995026090 (patch) | |
| tree | e9f8e3c469eeedb952a54b18221942c8c392b856 /pkgs | |
| parent | d0d5136cce5e0cbe2305c53090bd4bd886114746 (diff) | |
| download | nixpkgs-d34d84a61da7cf332e470b65ab05f2d995026090.tar nixpkgs-d34d84a61da7cf332e470b65ab05f2d995026090.tar.gz nixpkgs-d34d84a61da7cf332e470b65ab05f2d995026090.tar.bz2 nixpkgs-d34d84a61da7cf332e470b65ab05f2d995026090.tar.lz nixpkgs-d34d84a61da7cf332e470b65ab05f2d995026090.tar.xz nixpkgs-d34d84a61da7cf332e470b65ab05f2d995026090.tar.zst nixpkgs-d34d84a61da7cf332e470b65ab05f2d995026090.zip | |
firefox-wrapper: Get rid of name argument
Only pname + version is supported now. (Both are still optional, however.)
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/wrapper.nix | 5 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
2 files changed, 2 insertions, 6 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 69061cd0808..4901d694f49 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.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 ? "" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f4a3bcc0582..c973fe37fac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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"; }; |