treewide: Get rid of most parseDrvName without breaking compat
That is because this commit should be merged to both master and release-19.09.
This commit is contained in:
@@ -18,8 +18,10 @@ browser:
|
||||
|
||||
let
|
||||
wrapper =
|
||||
{ browserName ? browser.browserName or (builtins.parseDrvName browser.name).name
|
||||
, name ? (browserName + "-" + (builtins.parseDrvName browser.name).version)
|
||||
{ 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
|
||||
, desktopName ? # browserName with first letter capitalized
|
||||
(lib.toUpper (lib.substring 0 1 browserName) + lib.substring 1 (-1) browserName)
|
||||
, nameSuffix ? ""
|
||||
@@ -83,7 +85,7 @@ let
|
||||
gtk_modules = [ libcanberra-gtk2 ];
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
inherit name;
|
||||
inherit pname version;
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = browserName;
|
||||
|
||||
Reference in New Issue
Block a user