From 2f0195003ec528c203590012316571e46fa60940 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 1 Apr 2016 13:51:24 +0200 Subject: [PATCH] firefox-esr: Fix name The Firefox wrapped called itself "firefox" rather than "firefox-esr". Also eliminate a use of splitString which is evil and should never be used. --- pkgs/applications/networking/browsers/firefox/default.nix | 1 + pkgs/applications/networking/browsers/firefox/wrapper.nix | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 41f8cc155a8e..552c8d4d822e 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -122,6 +122,7 @@ common = { pname, version, sha256 }: stdenv.mkDerivation rec { passthru = { inherit gtk nspr version; isFirefox3Like = true; + browserName = pname; }; }; diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 91486b608b2c..5fb887bda220 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -9,8 +9,8 @@ }: ## configurability of the wrapper itself -browser : -{ browserName ? (lib.head (lib.splitString "-" browser.name)) # name of the executable +browser: +{ browserName ? browser.browserName or (builtins.parseDrvName browser.name).name , name ? (browserName + "-" + (builtins.parseDrvName browser.name).version) , desktopName ? # browserName with first letter capitalized (lib.toUpper (lib.substring 0 1 browserName) + lib.substring 1 (-1) browserName)