Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 485a99369cc7
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a1d8a274a3b4
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jan 1, 2020

  1. 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).
    @lheckemann
    lheckemann committed Jan 1, 2020
    Copy the full SHA
    1e840fc View commit details

Commits on Jan 14, 2020

  1. Merge pull request #76797 from lheckemann/rgl-fix 

    rPackages.rgl: fix build
    @lheckemann
    lheckemann authored Jan 14, 2020
    Copy the full SHA
    a1d8a27 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 pkgs/development/r-modules/default.nix
2 changes: 1 addition & 1 deletion pkgs/development/r-modules/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 ];