diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2020-01-17 21:56:26 +0100 |
|---|---|---|
| committer | Maximilian Bosch <maximilian@mbosch.me> | 2020-01-28 20:11:00 +0100 |
| commit | 3c525b702a390cf6712919deb1b1701db8448b41 (patch) | |
| tree | f9cb54bc87a2a67cc6b23d3a9590f6b15fa4f817 /pkgs/development/r-modules/default.nix | |
| parent | e1d35045bc73ad9c70c3c8466e5951ef6f5238b9 (diff) | |
| download | nixlib-3c525b702a390cf6712919deb1b1701db8448b41.tar nixlib-3c525b702a390cf6712919deb1b1701db8448b41.tar.gz nixlib-3c525b702a390cf6712919deb1b1701db8448b41.tar.bz2 nixlib-3c525b702a390cf6712919deb1b1701db8448b41.tar.lz nixlib-3c525b702a390cf6712919deb1b1701db8448b41.tar.xz nixlib-3c525b702a390cf6712919deb1b1701db8448b41.tar.zst nixlib-3c525b702a390cf6712919deb1b1701db8448b41.zip | |
r-packages: update
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.
Diffstat (limited to 'pkgs/development/r-modules/default.nix')
| -rw-r--r-- | pkgs/development/r-modules/default.nix | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index df44139024a5..2c927c7408c1 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -363,7 +363,7 @@ let topicmodels = [ pkgs.gsl_1 ]; udunits2 = [ pkgs.udunits pkgs.expat ]; units = [ pkgs.udunits ]; - V8 = [ pkgs.v8_3_14 ]; + V8 = [ pkgs.v8 ]; WhopGenome = [ pkgs.zlib.dev ]; XBRL = [ pkgs.zlib pkgs.libxml2.dev ]; xml2 = [ pkgs.libxml2.dev ] ++ lib.optionals stdenv.isDarwin [ pkgs.perl ]; @@ -849,11 +849,16 @@ let }); V8 = old.V8.overrideDerivation (attrs: { + postPatch = '' + substituteInPlace configure \ + --replace " -lv8_libplatform" "" + ''; + preConfigure = '' - export INCLUDE_DIR=${pkgs.v8_3_14}/include - export LIB_DIR=${pkgs.v8_3_14}/lib + export INCLUDE_DIR=${pkgs.v8}/include + export LIB_DIR=${pkgs.v8}/lib patchShebangs configure - ''; + ''; }); acs = old.acs.overrideDerivation (attrs: { |