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

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

Browse Source 
geogebra: fix 3D view again
This commit is contained in:
Pol Dellaiera
2024-03-07 19:53:05 +01:00
committed by GitHub
parent 0327c97ae4 aecaeee645
commit 983f7e7cfb
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/science/math/geogebra/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, xorg, jre, makeDesktopItem, makeWrapper, unzip, language ? "en_US" }:
{ lib, stdenv, fetchurl, libGL, xorg, jre, makeDesktopItem, makeWrapper, unzip, language ? "en_US" }:
let
pname = "geogebra";
version = "5-0-785-0";
@@ -55,10 +55,10 @@ let
installPhase = ''
install -D geogebra/* -t "$out/libexec/geogebra/"
# The bundled jogl (required for 3D graphics) links to libXxf86vm
# The bundled jogl (required for 3D graphics) links to libXxf86vm, and loads libGL at runtime
# OpenGL versions newer than 3.0 cause "javax.media.opengl.GLException: Not a GL2 implementation"
makeWrapper "$out/libexec/geogebra/geogebra" "$out/bin/geogebra" \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ xorg.libXxf86vm ]}" \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL xorg.libXxf86vm ]}" \
--set MESA_GL_VERSION_OVERRIDE 3.0 \
--set JAVACMD "${jre}/bin/java" \
--set GG_PATH "$out/libexec/geogebra" \