summary refs log tree commit diff
path: root/pkgs/applications
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2019-11-24 17:27:45 +0000
committerJohn Ericson <John.Ericson@Obsidian.Systems>2019-11-24 17:27:45 +0000
commitd34d84a61da7cf332e470b65ab05f2d995026090 (patch)
treee9f8e3c469eeedb952a54b18221942c8c392b856 /pkgs/applications
parentd0d5136cce5e0cbe2305c53090bd4bd886114746 (diff)
downloadnixpkgs-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/applications')
-rw-r--r--pkgs/applications/networking/browsers/firefox/wrapper.nix5
1 files changed, 2 insertions, 3 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 ? ""