Merge pull request #248386 from alois31/geogebra-3d

geogebra: Fix 3D view

authored by Pol Dellaiera and committed by GitHub 152f609b 5a31db94

+5 -1
+5 -1
pkgs/applications/science/math/geogebra/default.nix
··· 1 - { lib, stdenv, fetchurl, jre, makeDesktopItem, makeWrapper, unzip, language ? "en_US" }: 1 + { lib, stdenv, fetchurl, xorg, jre, makeDesktopItem, makeWrapper, unzip, language ? "en_US" }: 2 2 let 3 3 pname = "geogebra"; 4 4 version = "5-0-785-0"; ··· 55 55 installPhase = '' 56 56 install -D geogebra/* -t "$out/libexec/geogebra/" 57 57 58 + # The bundled jogl (required for 3D graphics) links to libXxf86vm 59 + # OpenGL versions newer than 3.0 cause "javax.media.opengl.GLException: Not a GL2 implementation" 58 60 makeWrapper "$out/libexec/geogebra/geogebra" "$out/bin/geogebra" \ 61 + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ xorg.libXxf86vm ]}" \ 62 + --set MESA_GL_VERSION_OVERRIDE 3.0 \ 59 63 --set JAVACMD "${jre}/bin/java" \ 60 64 --set GG_PATH "$out/libexec/geogebra" \ 61 65 --add-flags "--language=${language}"