public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sweethome3d: 5.2 -> 5.4

Browse Source
This commit is contained in:
Matthias Herrmann 2017-02-12 20:22:35 +01:00 committed by Bjørn Forsman
parent 9775a26da3
commit be7a6eb70e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/misc/sweethome3d/default.nix
View File

@ -6,9 +6,8 @@ let
getDesktopFileName = drvName: (builtins.parseDrvName drvName).name; getDesktopFileName = drvName: (builtins.parseDrvName drvName).name;
# TODO: Should we move this to `lib`? Seems like its would be useful in many cases. # TODO: Should we move this to `lib`? Seems like its would be useful in many cases.
extensionOf = filePath: extensionOf = filePath:
lib.concatStringsSep "." (lib.tail (lib.splitString "." lib.concatStringsSep "." (lib.tail (lib.splitString "." (builtins.baseNameOf filePath)));
(builtins.baseNameOf filePath)));
installIcons = iconName: icons: lib.concatStringsSep "\n" (lib.mapAttrsToList (size: iconFile: '' installIcons = iconName: icons: lib.concatStringsSep "\n" (lib.mapAttrsToList (size: iconFile: ''
mkdir -p "$out/share/icons/hicolor/${size}/apps" mkdir -p "$out/share/icons/hicolor/${size}/apps"
@ -68,14 +67,14 @@ let
in rec { in rec {
application = mkSweetHome3D rec { application = mkSweetHome3D rec {
version = "5.2"; version = "5.4";
module = "SweetHome3D"; module = "SweetHome3D";
name = stdenv.lib.toLower module + "-application-" + version; name = stdenv.lib.toLower module + "-application-" + version;
description = "Design and visualize your future home"; description = "Design and visualize your future home";
license = stdenv.lib.licenses.gpl2Plus; license = stdenv.lib.licenses.gpl2Plus;
src = fetchcvs { src = fetchcvs {
cvsRoot = ":pserver:anonymous@sweethome3d.cvs.sourceforge.net:/cvsroot/sweethome3d"; cvsRoot = ":pserver:anonymous@sweethome3d.cvs.sourceforge.net:/cvsroot/sweethome3d";
sha256 = "0vws3lj5lgix5fz2hpqvz6p79py5gbfpkhmqpfb1knx1a12310bb"; sha256 = "09sk4svmaiw8dabcya3407iq5yjwxbss8pik1rzalrlds2428vyw";
module = module; module = module;
tag = "V_" + d2u version; tag = "V_" + d2u version;
}; };

1
pkgs/applications/misc/sweethome3d/editors.nix
View File

@ -30,6 +30,7 @@ let
patchPhase = '' patchPhase = ''
sed -i -e 's,../SweetHome3D,${application.src},g' build.xml sed -i -e 's,../SweetHome3D,${application.src},g' build.xml
sed -i -e 's,lib/macosx/java3d-1.6/jogl-all.jar,lib/java3d-1.6/jogl-all.jar,g' build.xml
''; '';
buildPhase = '' buildPhase = ''