diff options
author | Linus Heckemann <git@sphalerite.org> | 2020-01-01 20:37:38 +0100 |
---|---|---|
committer | Linus Heckemann <git@sphalerite.org> | 2020-01-01 20:37:38 +0100 |
commit | 1e840fc421d3538404f041d7d3e61fb0f567e281 (patch) | |
tree | c3d0ff4328b3488cca6277f0723fd01c794d6ac9 /pkgs/development/r-modules | |
parent | b0bbacb52134a7e731e549f4c0a7a2a39ca6b481 (diff) |
rgl: fix build
It seems that the dev output of libGLU needs to be included explicitly for this to work. I've also moved the libraries from nativeBuildInputs to buildInputs to be more semantically correct (and maybe support cross compilation, not tested though).
Diffstat (limited to 'pkgs/development/r-modules')
-rw-r--r-- | pkgs/development/r-modules/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 2019ee45f3cdc..5fa0cd15962dc 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -311,7 +311,6 @@ let rgdal = [ pkgs.proj.dev pkgs.gdal ]; rgeos = [ pkgs.geos ]; rggobi = [ pkgs.ggobi pkgs.gtk2.dev pkgs.libxml2.dev ]; - rgl = [ pkgs.libGLU pkgs.libGL pkgs.xlibsWrapper ]; Rglpk = [ pkgs.glpk ]; RGtk2 = [ pkgs.gtk2.dev ]; rhdf5 = [ pkgs.zlib ]; @@ -404,6 +403,7 @@ let RCurl = [ pkgs.curl.dev ]; R2SWF = [ pkgs.pkgconfig ]; rggobi = [ pkgs.pkgconfig ]; + rgl = [ pkgs.libGLU pkgs.libGLU.dev pkgs.libGL pkgs.xlibsWrapper ]; RGtk2 = [ pkgs.pkgconfig ]; RProtoBuf = [ pkgs.pkgconfig ]; Rpoppler = [ pkgs.pkgconfig ]; |