diff options
| author | Matthias Herrmann <matthias.mh.herrmann@googlemail.com> | 2017-02-12 20:22:35 +0100 |
|---|---|---|
| committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2017-02-13 22:09:35 +0100 |
| commit | be7a6eb70e7c305eed877850c9ebb6d50c52457e (patch) | |
| tree | 486cc213e235c5e503aad22f715a07be594989fe /pkgs/applications/misc/sweethome3d | |
| parent | 9775a26da39e72298bae1914ddec24799f80e33f (diff) | |
| download | nixlib-be7a6eb70e7c305eed877850c9ebb6d50c52457e.tar nixlib-be7a6eb70e7c305eed877850c9ebb6d50c52457e.tar.gz nixlib-be7a6eb70e7c305eed877850c9ebb6d50c52457e.tar.bz2 nixlib-be7a6eb70e7c305eed877850c9ebb6d50c52457e.tar.lz nixlib-be7a6eb70e7c305eed877850c9ebb6d50c52457e.tar.xz nixlib-be7a6eb70e7c305eed877850c9ebb6d50c52457e.tar.zst nixlib-be7a6eb70e7c305eed877850c9ebb6d50c52457e.zip | |
sweethome3d: 5.2 -> 5.4
Diffstat (limited to 'pkgs/applications/misc/sweethome3d')
| -rw-r--r-- | pkgs/applications/misc/sweethome3d/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/applications/misc/sweethome3d/editors.nix | 1 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix index 68dd69f385d9..4a530a927815 100644 --- a/pkgs/applications/misc/sweethome3d/default.nix +++ b/pkgs/applications/misc/sweethome3d/default.nix @@ -6,9 +6,8 @@ let getDesktopFileName = drvName: (builtins.parseDrvName drvName).name; # TODO: Should we move this to `lib`? Seems like its would be useful in many cases. - extensionOf = filePath: - lib.concatStringsSep "." (lib.tail (lib.splitString "." - (builtins.baseNameOf filePath))); + extensionOf = filePath: + lib.concatStringsSep "." (lib.tail (lib.splitString "." (builtins.baseNameOf filePath))); installIcons = iconName: icons: lib.concatStringsSep "\n" (lib.mapAttrsToList (size: iconFile: '' mkdir -p "$out/share/icons/hicolor/${size}/apps" @@ -68,14 +67,14 @@ let in rec { application = mkSweetHome3D rec { - version = "5.2"; + version = "5.4"; module = "SweetHome3D"; name = stdenv.lib.toLower module + "-application-" + version; description = "Design and visualize your future home"; license = stdenv.lib.licenses.gpl2Plus; src = fetchcvs { cvsRoot = ":pserver:anonymous@sweethome3d.cvs.sourceforge.net:/cvsroot/sweethome3d"; - sha256 = "0vws3lj5lgix5fz2hpqvz6p79py5gbfpkhmqpfb1knx1a12310bb"; + sha256 = "09sk4svmaiw8dabcya3407iq5yjwxbss8pik1rzalrlds2428vyw"; module = module; tag = "V_" + d2u version; }; diff --git a/pkgs/applications/misc/sweethome3d/editors.nix b/pkgs/applications/misc/sweethome3d/editors.nix index 61b47dcdd2ad..7dbf1e8f2a31 100644 --- a/pkgs/applications/misc/sweethome3d/editors.nix +++ b/pkgs/applications/misc/sweethome3d/editors.nix @@ -30,6 +30,7 @@ let patchPhase = '' 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 = '' |