@@ -3,8 +3,6 @@
33
44let
55
6− getDesktopFileName = drvName: (builtins.parseDrvName drvName).name;
7−
86 # TODO: Should we move this to `lib`? Seems like its would be useful in many cases.
97 extensionOf = filePath:
108 lib.concatStringsSep "." (lib.tail (lib.splitString "." (builtins.baseNameOf filePath)));
@@ -15,15 +13,15 @@ let
1513 '') icons);
1614
1715 mkSweetHome3D =
18− { name, module, version, src, license, description, desktopName, icons }:
16+ { pname, module, version, src, license, description, desktopName, icons }:
1917
2018 stdenv.mkDerivation rec {
21− inherit name version src description;
19+ inherit pname version src description;
2220 exec = stdenv.lib.toLower module;
2321 sweethome3dItem = makeDesktopItem {
2422 inherit exec desktopName;
25− name = getDesktopFileName name;
26− icon = getDesktopFileName name;
23+ name = pname;
24+ icon = pname;
2725 comment = description;
2826 genericName = "Computer Aided (Interior) Design";
2927 categories = "Application;Graphics;2DGraphics;3DGraphics;";
@@ -49,7 +47,7 @@ let
4947 mkdir -p $out/bin
5048 cp install/${module}-${version}.jar $out/share/java/.
5149
52− ${installIcons (getDesktopFileName name) icons}
50+ ${installIcons pname icons}
5351
5452 cp "${sweethome3dItem}/share/applications/"* $out/share/applications
5553
@@ -74,9 +72,9 @@ let
7472in {
7573
7674 application = mkSweetHome3D rec {
75+ pname = stdenv.lib.toLower module + "-application";
7776 version = "6.2";
7877 module = "SweetHome3D";
79− name = stdenv.lib.toLower module + "-application-" + version;
8078 description = "Design and visualize your future home";
8179 license = stdenv.lib.licenses.gpl2Plus;
8280 src = fetchsvn {