MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-19 00:08:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

r-packages: update

Browse source 
This update was primarily done to update rPackages.V8 to 3.0 which
doesn't depend on an ancient version of v8 anymore.

Also dropped the `-lv8_libplatform` linker flag. It seems as this now
part of `v8.so` as `v8_libplatform.so` doesn't exist anymore on recent
v8 versions in nixpkgs, but the headers are still there and there aren't
any "undefined reference to" errors while linking.
This commit is contained in:
Maximilian Bosch 2020-01-17 21:56:26 +01:00
parent e1d35045bc
commit 3c525b702a
No known key found for this signature in database
GPG key ID: 091DBF4D1FC46B8E
2 changed files with 199 additions and 170 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

356
pkgs/development/r-modules/cran-packages.nix generated
View file

File diff suppressed because it is too large Load diff

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

@ -363,7 +363,7 @@ let
topicmodels = [ pkgs.gsl_1 ]; topicmodels = [ pkgs.gsl_1 ];
udunits2 = [ pkgs.udunits pkgs.expat ]; udunits2 = [ pkgs.udunits pkgs.expat ];
units = [ pkgs.udunits ]; units = [ pkgs.udunits ];
V8 = [ pkgs.v8_3_14 ]; V8 = [ pkgs.v8 ];
WhopGenome = [ pkgs.zlib.dev ]; WhopGenome = [ pkgs.zlib.dev ];
XBRL = [ pkgs.zlib pkgs.libxml2.dev ]; XBRL = [ pkgs.zlib pkgs.libxml2.dev ];
xml2 = [ pkgs.libxml2.dev ] ++ lib.optionals stdenv.isDarwin [ pkgs.perl ]; xml2 = [ pkgs.libxml2.dev ] ++ lib.optionals stdenv.isDarwin [ pkgs.perl ];
@ -849,11 +849,16 @@ let
}); });
V8 = old.V8.overrideDerivation (attrs: { V8 = old.V8.overrideDerivation (attrs: {
postPatch = ''
substituteInPlace configure \
--replace " -lv8_libplatform" ""
'';
preConfigure = '' preConfigure = ''
export INCLUDE_DIR=${pkgs.v8_3_14}/include export INCLUDE_DIR=${pkgs.v8}/include
export LIB_DIR=${pkgs.v8_3_14}/lib export LIB_DIR=${pkgs.v8}/lib
patchShebangs configure patchShebangs configure
''; '';
}); });
acs = old.acs.overrideDerivation (attrs: { acs = old.acs.overrideDerivation (attrs: {