diff options
| author | volth <volth@webmaster.ms> | 2018-06-10 15:09:19 +0000 |
|---|---|---|
| committer | xeji <36407913+xeji@users.noreply.github.com> | 2018-06-10 17:09:19 +0200 |
| commit | 70050dbc48d61364248f8d453bd1408435f76c81 (patch) | |
| tree | a05f733ce703e6a530dedea506de59c9d1f4f162 /pkgs/development/java-modules | |
| parent | fc9ffe790f5f0c3c378b1af25f3a45333145fded (diff) | |
| download | nixpkgs-70050dbc48d61364248f8d453bd1408435f76c81.tar nixpkgs-70050dbc48d61364248f8d453bd1408435f76c81.tar.gz nixpkgs-70050dbc48d61364248f8d453bd1408435f76c81.tar.bz2 nixpkgs-70050dbc48d61364248f8d453bd1408435f76c81.tar.lz nixpkgs-70050dbc48d61364248f8d453bd1408435f76c81.tar.xz nixpkgs-70050dbc48d61364248f8d453bd1408435f76c81.tar.zst nixpkgs-70050dbc48d61364248f8d453bd1408435f76c81.zip | |
jogl: reflect recent changes in opengl (#41786)
Diffstat (limited to 'pkgs/development/java-modules')
| -rw-r--r-- | pkgs/development/java-modules/jogl/default.nix | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/development/java-modules/jogl/default.nix b/pkgs/development/java-modules/jogl/default.nix index 474eaa0e1dc..cceec44e6ae 100644 --- a/pkgs/development/java-modules/jogl/default.nix +++ b/pkgs/development/java-modules/jogl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, makeWrapper, ant, jdk, openjdk8, zulu8, git, xorg, udev }: +{ stdenv, fetchgit, makeWrapper, ant, jdk, openjdk8, zulu8, git, xorg, udev, libGL, libGLU }: let # workaround https://github.com/NixOS/nixpkgs/issues/37364 @@ -19,12 +19,18 @@ in name = "jogl-${version}"; src = fetchgit { - url = http://jogamp.org/srv/scm/jogl.git; + url = git://jogamp.org/srv/scm/jogl.git; rev = "v${version}"; sha256 = "0msi2gxiqm2yqwkmxqbh521xdrimw1fly20g890r357rcgj8fsn3"; fetchSubmodules = true; }; + postPatch = '' + find . -type f -name '*.java' \ + -exec sed -i 's@"libGL.so"@"${libGL}/lib/libGL.so"@' {} \; \ + -exec sed -i 's@"libGLU.so"@"${libGLU}/lib/libGLU.so"@' {} \; + ''; + buildInputs = [ jdk-without-symlinks ant git udev xorg.libX11 xorg.libXrandr xorg.libXcursor xorg.libXt xorg.libXxf86vm xorg.libXrender ]; buildPhase = '' |