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:
@@ -7,20 +7,17 @@ let
|
||||
m: "sweethome3d-"
|
||||
+ removeSuffix "libraryeditor" (toLower m)
|
||||
+ "-editor";
|
||||
sweetName = m: v: sweetExec m + "-" + v;
|
||||
|
||||
getDesktopFileName = drvName: (builtins.parseDrvName drvName).name;
|
||||
|
||||
mkEditorProject =
|
||||
{ name, module, version, src, license, description, desktopName }:
|
||||
{ pname, module, version, src, license, description, desktopName }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
application = sweethome3dApp;
|
||||
inherit name module version src description;
|
||||
inherit pname module version src description;
|
||||
exec = sweetExec module;
|
||||
editorItem = makeDesktopItem {
|
||||
inherit exec desktopName;
|
||||
name = getDesktopFileName name;
|
||||
name = pname;
|
||||
comment = description;
|
||||
genericName = "Computer Aided (Interior) Design";
|
||||
categories = "Application;Graphics;2DGraphics;3DGraphics;";
|
||||
@@ -66,7 +63,7 @@ in {
|
||||
textures-editor = mkEditorProject rec {
|
||||
version = "1.5";
|
||||
module = "TexturesLibraryEditor";
|
||||
name = sweetName module version;
|
||||
pname = module;
|
||||
description = "Easily create SH3T files and edit the properties of the texture images it contain";
|
||||
license = stdenv.lib.licenses.gpl2Plus;
|
||||
src = fetchcvs {
|
||||
@@ -81,7 +78,7 @@ in {
|
||||
furniture-editor = mkEditorProject rec {
|
||||
version = "1.19";
|
||||
module = "FurnitureLibraryEditor";
|
||||
name = sweetName module version;
|
||||
pname = module;
|
||||
description = "Quickly create SH3F files and edit the properties of the 3D models it contain";
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
src = fetchcvs {
|
||||
|
||||
Reference in New Issue
Block a user