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

firefox-esr: Fix name

Browse Source 
The Firefox wrapped called itself "firefox" rather than "firefox-esr".

Also eliminate a use of splitString which is evil and should never be
used.
This commit is contained in:
Eelco Dolstra 2016-04-01 13:51:24 +02:00
parent 13a1c7b8c1
commit 2f0195003e
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/applications/networking/browsers/firefox/default.nix
View File

@ -122,6 +122,7 @@ common = { pname, version, sha256 }: stdenv.mkDerivation rec {
passthru = { passthru = {
inherit gtk nspr version; inherit gtk nspr version;
isFirefox3Like = true; isFirefox3Like = true;
browserName = pname;
}; };
}; };

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

@ -10,7 +10,7 @@
## configurability of the wrapper itself ## configurability of the wrapper itself
browser: browser:
{ browserName ? (lib.head (lib.splitString "-" browser.name)) # name of the executable { browserName ? browser.browserName or (builtins.parseDrvName browser.name).name
, name ? (browserName + "-" + (builtins.parseDrvName browser.name).version) , name ? (browserName + "-" + (builtins.parseDrvName browser.name).version)
, 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)