git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #97129 from raboof/sweethome3d-6.3-to-6.4.2

sweethome3d: 6.3 -> 6.4.2

commit571553572add17a4329d628e51f9c8aa6944fa33 authorTimo Kaufmann <timokau@zoho.com> dateTue 17 Nov 2020, 22:40 (6 years ago) parentc05e9d99fb57eb
1 file changed+8−3
pkgs/applications/misc/sweethome3d/default.nix+8−3
pkgs/applications/misc/sweethome3d/default.nix+8−3
@@ -51,7 +51,12 @@ let
5151
5252 cp "${sweethome3dItem}/share/applications/"* $out/share/applications
5353
54+ # MESA_GL_VERSION_OVERRIDE is needed since the update from MESA 19.3.3 to 20.0.2:
55+ # without it a "Profiles [GL4bc, GL3bc, GL2, GLES1] not available on device null"
56+ # exception is thrown on startup.
57+ # https://discourse.nixos.org/t/glx-not-recognised-after-mesa-update/6753
5458 makeWrapper ${jre}/bin/java $out/bin/$exec \
59+ --set MESA_GL_VERSION_OVERRIDE 2.1 \
5560 --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings-desktop-schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \
5661 --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}"
5762 '';
@@ -73,14 +78,14 @@ in {
7378
7479 application = mkSweetHome3D rec {
7580 pname = stdenv.lib.toLower module + "-application";
76− version = "6.3";
81+ version = "6.4.2";
7782 module = "SweetHome3D";
7883 description = "Design and visualize your future home";
7984 license = stdenv.lib.licenses.gpl2Plus;
8085 src = fetchsvn {
8186 url = "https://svn.code.sf.net/p/sweethome3d/code/tags/V_" + d2u version + "/SweetHome3D/";
82− sha256 = "1c13g0f73jgbzmjhdm9knqq1kh3vdl04zl3xlp30g9a1n0jkr38i";
83− rev = "6896";
87+ sha256 = "13rczayakwb5246hqnp8lnw61p0p7ywr2294bnlp4zwsrz1in9z4";
88+ rev = "7504";
8489 };
8590 desktopName = "Sweet Home 3D";
8691 icons = {