alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

r-nloptr: fix build by adding pkgconfig

Browse source
This commit is contained in:
Peter Simons 2018-11-02 12:41:45 +01:00
parent 9f9fc7ae15
commit c9e1380626
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/development/r-modules/default.nix
View file

@ -281,7 +281,7 @@ let
mvabund = [ pkgs.gsl_1 ];
mwaved = [ pkgs.fftw.dev ];
ncdf4 = [ pkgs.netcdf ];
nloptr = [ pkgs.nlopt ];
nloptr = [ pkgs.nlopt pkgs.pkgconfig ];
odbc = [ pkgs.unixODBC ];
outbreaker = [ pkgs.gsl_1 ];
pander = [ pkgs.pandoc pkgs.which ];
@ -855,10 +855,9 @@ let
});
nloptr = old.nloptr.overrideDerivation (attrs: {
configureFlags = [
"--with-nlopt-cflags=-I${pkgs.nlopt}/include"
"--with-nlopt-libs='-L${pkgs.nlopt}/lib -lnlopt_cxx -lm'"
];
# Drop bundled nlopt source code. Probably unnecessary, but I want to be
# sure we're using the system library, not this one.
preConfigure = "rm -r src/nlopt_src";
});
V8 = old.V8.overrideDerivation (attrs: {