diff options
| author | Timo Kaufmann <timokau@zoho.com> | 2020-11-17 22:40:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-17 22:40:24 +0100 |
| commit | 571553572add17a4329d628e51f9c8aa6944fa33 (patch) | |
| tree | 39349fbbb0c7870157338db7495fc17225a6f193 /pkgs/applications | |
| parent | c05e9d953749ebcb8f8ddcf78c2183db20385341 (diff) | |
| parent | 9fb57ebd5064669e98ad66c4bbf625d142c919cb (diff) | |
| download | nixpkgs-571553572add17a4329d628e51f9c8aa6944fa33.tar nixpkgs-571553572add17a4329d628e51f9c8aa6944fa33.tar.gz nixpkgs-571553572add17a4329d628e51f9c8aa6944fa33.tar.bz2 nixpkgs-571553572add17a4329d628e51f9c8aa6944fa33.tar.lz nixpkgs-571553572add17a4329d628e51f9c8aa6944fa33.tar.xz nixpkgs-571553572add17a4329d628e51f9c8aa6944fa33.tar.zst nixpkgs-571553572add17a4329d628e51f9c8aa6944fa33.zip | |
Merge pull request #97129 from raboof/sweethome3d-6.3-to-6.4.2
sweethome3d: 6.3 -> 6.4.2
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/misc/sweethome3d/default.nix | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix index 94875de7ebc..bf2db296650 100644 --- a/pkgs/applications/misc/sweethome3d/default.nix +++ b/pkgs/applications/misc/sweethome3d/default.nix @@ -51,7 +51,12 @@ let cp "${sweethome3dItem}/share/applications/"* $out/share/applications + # MESA_GL_VERSION_OVERRIDE is needed since the update from MESA 19.3.3 to 20.0.2: + # without it a "Profiles [GL4bc, GL3bc, GL2, GLES1] not available on device null" + # exception is thrown on startup. + # https://discourse.nixos.org/t/glx-not-recognised-after-mesa-update/6753 makeWrapper ${jre}/bin/java $out/bin/$exec \ + --set MESA_GL_VERSION_OVERRIDE 2.1 \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings-desktop-schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ --add-flags "-Dsun.java2d.opengl=true -jar $out/share/java/${module}-${version}.jar -cp $out/share/java/Furniture.jar:$out/share/java/Textures.jar:$out/share/java/Help.jar -d${toString stdenv.hostPlatform.parsed.cpu.bits}" ''; @@ -73,14 +78,14 @@ in { application = mkSweetHome3D rec { pname = stdenv.lib.toLower module + "-application"; - version = "6.3"; + version = "6.4.2"; module = "SweetHome3D"; description = "Design and visualize your future home"; license = stdenv.lib.licenses.gpl2Plus; src = fetchsvn { url = "https://svn.code.sf.net/p/sweethome3d/code/tags/V_" + d2u version + "/SweetHome3D/"; - sha256 = "1c13g0f73jgbzmjhdm9knqq1kh3vdl04zl3xlp30g9a1n0jkr38i"; - rev = "6896"; + sha256 = "13rczayakwb5246hqnp8lnw61p0p7ywr2294bnlp4zwsrz1in9z4"; + rev = "7504"; }; desktopName = "Sweet Home 3D"; icons = { |