mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-24 16:03:23 +00:00
geogebra: fix 3D view again
This commit is contained in:
parent
1536926ef5
commit
aecaeee645
@ -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" \
|
||||
|
Loading…
Reference in New Issue
Block a user