From 3c525b702a390cf6712919deb1b1701db8448b41 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 17 Jan 2020 21:56:26 +0100 Subject: 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. --- pkgs/development/r-modules/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'pkgs/development/r-modules/default.nix') 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: { -- cgit v1.2.3