nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-17 01:24:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

rPackages.V8: use nodejs.libv8

Browse Source
This commit is contained in:
Thomas Gerbet 2024-05-30 11:56:30 +02:00
parent 826cc7fa1c
commit 214a77ff83
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/r-modules/default.nix
View File

@ -483,7 +483,7 @@ let
units = [ pkgs.udunits ]; units = [ pkgs.udunits ];
unigd = [ pkgs.pkg-config ]; unigd = [ pkgs.pkg-config ];
vdiffr = [ pkgs.libpng.dev ]; vdiffr = [ pkgs.libpng.dev ];
V8 = [ pkgs.v8 ]; V8 = [ pkgs.nodejs.libv8 ];
XBRL = with pkgs; [ zlib libxml2.dev ]; XBRL = with pkgs; [ zlib libxml2.dev ];
XLConnect = [ pkgs.jdk ]; XLConnect = [ pkgs.jdk ];
xml2 = [ pkgs.libxml2.dev ] ++ lib.optionals stdenv.isDarwin [ pkgs.perl ]; xml2 = [ pkgs.libxml2.dev ] ++ lib.optionals stdenv.isDarwin [ pkgs.perl ];
@ -1407,12 +1407,15 @@ let
V8 = old.V8.overrideAttrs (attrs: { V8 = old.V8.overrideAttrs (attrs: {
postPatch = '' postPatch = ''
substituteInPlace configure \ substituteInPlace configure \
--replace " -lv8_libplatform" "" --replace-fail " -lv8_libplatform" ""
# Bypass the test checking if pointer compression is needed
substituteInPlace configure \
--replace-fail "./pctest1" "true"
''; '';
preConfigure = '' preConfigure = ''
export INCLUDE_DIR=${pkgs.v8}/include export INCLUDE_DIR=${pkgs.nodejs.libv8}/include
export LIB_DIR=${pkgs.v8}/lib export LIB_DIR=${pkgs.nodejs.libv8}/lib
patchShebangs configure patchShebangs configure
''; '';