tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom

sweethome3d.{application,furniture-editor}: version bumps sweethome3d.*: make sure gsetting schemas are picked up

Edward Tjörnhammar dfb8f0db 25f4f78c

+14 -12
unified split
+7 -6
pkgs/applications/misc/sweethome3d/default.nix
··· 1 { stdenv, fetchurl, fetchcvs, makeWrapper, makeDesktopItem, jdk, jre, ant 2 - , p7zip }: 3 4 let 5 ··· 17 categories = "Application;CAD;"; 18 }; 19 20 - buildInputs = [ ant jdk jre makeWrapper p7zip ]; 21 22 buildPhase = '' 23 ant furniture textures help 24 mkdir -p $out/share/{java,applications} 25 - mv build/*.jar $out/share/java/. 26 ant 27 ''; 28 29 installPhase = '' 30 mkdir -p $out/bin 31 cp install/${module}-${version}.jar $out/share/java/. 32 - cp ${sweethome3dItem}/share/applications/* $out/share/applications 33 makeWrapper ${jre}/bin/java $out/bin/$exec \ 34 --add-flags "-jar $out/share/java/${module}-${version}.jar -cp $out/share/java/Furniture.jar:$out/share/java/Textures.jar:$out/share/java/Help.jar ${if stdenv.system == "x86_64-linux" then "-d64" else "-d32"}" 35 ''; 36 ··· 50 in rec { 51 52 application = mkSweetHome3D rec { 53 - version = "4.4"; 54 module = "SweetHome3D"; 55 name = stdenv.lib.toLower module + "-application-" + version; 56 description = "Design and visualize your future home"; 57 license = stdenv.lib.licenses.gpl2Plus; 58 src = fetchcvs { 59 cvsRoot = ":pserver:anonymous@sweethome3d.cvs.sourceforge.net:/cvsroot/sweethome3d"; 60 - sha256 = "1ziqq8wm6la7bsqya6gc8cc2vz02phl88msqjgqqfl2jf8bz9afv"; 61 module = module; 62 tag = "V_" + d2u version; 63 };
··· 1 { stdenv, fetchurl, fetchcvs, makeWrapper, makeDesktopItem, jdk, jre, ant 2 + , gtk3, gsettings_desktop_schemas, p7zip }: 3 4 let 5 ··· 17 categories = "Application;CAD;"; 18 }; 19 20 + buildInputs = [ ant jdk jre makeWrapper p7zip gtk3 gsettings_desktop_schemas ]; 21 22 buildPhase = '' 23 ant furniture textures help 24 mkdir -p $out/share/{java,applications} 25 + mv "build/"*.jar $out/share/java/. 26 ant 27 ''; 28 29 installPhase = '' 30 mkdir -p $out/bin 31 cp install/${module}-${version}.jar $out/share/java/. 32 + cp "${sweethome3dItem}/share/applications/"* $out/share/applications 33 makeWrapper ${jre}/bin/java $out/bin/$exec \ 34 + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${gsettings_desktop_schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ 35 --add-flags "-jar $out/share/java/${module}-${version}.jar -cp $out/share/java/Furniture.jar:$out/share/java/Textures.jar:$out/share/java/Help.jar ${if stdenv.system == "x86_64-linux" then "-d64" else "-d32"}" 36 ''; 37 ··· 51 in rec { 52 53 application = mkSweetHome3D rec { 54 + version = "4.6.2"; 55 module = "SweetHome3D"; 56 name = stdenv.lib.toLower module + "-application-" + version; 57 description = "Design and visualize your future home"; 58 license = stdenv.lib.licenses.gpl2Plus; 59 src = fetchcvs { 60 cvsRoot = ":pserver:anonymous@sweethome3d.cvs.sourceforge.net:/cvsroot/sweethome3d"; 61 + sha256 = "0pm0rl5y90cjwyjma7g6nnaz6dv4bqcy8vl3zzxfj0q02ww01gbz"; 62 module = module; 63 tag = "V_" + d2u version; 64 };
+7 -6
pkgs/applications/misc/sweethome3d/editors.nix
··· 1 { stdenv, fetchurl, fetchcvs, makeWrapper, makeDesktopItem, jdk, jre, ant 2 - , p7zip, sweethome3dApp }: 3 4 let 5 ··· 24 categories = "Application;CAD;"; 25 }; 26 27 - buildInputs = [ ant jre jdk makeWrapper ]; 28 29 patchPhase = '' 30 sed -i -e 's,../SweetHome3D,${application.src},g' build.xml ··· 38 mkdir -p $out/bin 39 mkdir -p $out/share/{java,applications} 40 cp ${module}-${version}.jar $out/share/java/. 41 - cp ${editorItem}/share/applications/* $out/share/applications 42 makeWrapper ${jre}/bin/java $out/bin/$exec \ 43 --add-flags "-jar $out/share/java/${module}-${version}.jar ${if stdenv.system == "x86_64-linux" then "-d64" else "-d32"}" 44 ''; 45 ··· 57 58 d2u = stdenv.lib.replaceChars ["."] ["_"]; 59 60 - in rec { 61 62 textures-editor = mkEditorProject rec { 63 version = "1.4"; ··· 74 }; 75 76 furniture-editor = mkEditorProject rec { 77 - version = "1.14"; 78 module = "FurnitureLibraryEditor"; 79 name = sweetName module version; 80 description = "Quickly create SH3F files and edit the properties of the 3D models it contain"; 81 license = stdenv.lib.licenses.gpl2; 82 src = fetchcvs { 83 cvsRoot = ":pserver:anonymous@sweethome3d.cvs.sourceforge.net:/cvsroot/sweethome3d"; 84 - sha256 = "0rdcd8vjbcv9jdms2xr3y7ykm2a9bkmwj4y7ybk9zcldayqsgn6z"; 85 module = module; 86 tag = "V_" + d2u version; 87 };
··· 1 { stdenv, fetchurl, fetchcvs, makeWrapper, makeDesktopItem, jdk, jre, ant 2 + , gtk3, gsettings_desktop_schemas, p7zip, sweethome3dApp }: 3 4 let 5 ··· 24 categories = "Application;CAD;"; 25 }; 26 27 + buildInputs = [ ant jre jdk makeWrapper gtk3 gsettings_desktop_schemas ]; 28 29 patchPhase = '' 30 sed -i -e 's,../SweetHome3D,${application.src},g' build.xml ··· 38 mkdir -p $out/bin 39 mkdir -p $out/share/{java,applications} 40 cp ${module}-${version}.jar $out/share/java/. 41 + cp "${editorItem}/share/applications/"* $out/share/applications 42 makeWrapper ${jre}/bin/java $out/bin/$exec \ 43 + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${gsettings_desktop_schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ 44 --add-flags "-jar $out/share/java/${module}-${version}.jar ${if stdenv.system == "x86_64-linux" then "-d64" else "-d32"}" 45 ''; 46 ··· 58 59 d2u = stdenv.lib.replaceChars ["."] ["_"]; 60 61 + in { 62 63 textures-editor = mkEditorProject rec { 64 version = "1.4"; ··· 75 }; 76 77 furniture-editor = mkEditorProject rec { 78 + version = "1.16"; 79 module = "FurnitureLibraryEditor"; 80 name = sweetName module version; 81 description = "Quickly create SH3F files and edit the properties of the 3D models it contain"; 82 license = stdenv.lib.licenses.gpl2; 83 src = fetchcvs { 84 cvsRoot = ":pserver:anonymous@sweethome3d.cvs.sourceforge.net:/cvsroot/sweethome3d"; 85 + sha256 = "09dmb0835kncs1ngszhyp1pgvj7vqjjrp9q405gakm8ylrzym374"; 86 module = module; 87 tag = "V_" + d2u version; 88 };