public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #17223 from proglodyte/v8-static

Browse Source 
v8: add static config option
This commit is contained in:
Robin Gloster 2016-07-27 16:36:37 +02:00 committed by GitHub
commit 54c46d18ea
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/v8/default.nix
View File

@ -1,6 +1,7 @@
{ stdenv, lib, fetchgit, fetchFromGitHub, gyp, readline, python, which, icu { stdenv, lib, fetchgit, fetchFromGitHub, gyp, readline, python, which, icu
, patchelf, coreutils , patchelf, coreutils
, doCheck ? false , doCheck ? false
, static ? false
}: }:
assert readline != null; assert readline != null;
@ -15,6 +16,7 @@ let
else "ia32"; else "ia32";
git_url = "https://chromium.googlesource.com"; git_url = "https://chromium.googlesource.com";
clangFlag = if stdenv.isDarwin then "1" else "0"; clangFlag = if stdenv.isDarwin then "1" else "0";
sharedFlag = if static then "static_library" else "shared_library";
deps = { deps = {
"build" = fetchgit { "build" = fetchgit {
@ -143,7 +145,7 @@ stdenv.mkDerivation rec {
-Dclang=${clangFlag} \ -Dclang=${clangFlag} \
-Dv8_enable_i18n_support=1 \ -Dv8_enable_i18n_support=1 \
-Duse_system_icu=1 \ -Duse_system_icu=1 \
-Dcomponent=shared_library \ -Dcomponent=${sharedFlag} \
-Dconsole=readline \ -Dconsole=readline \
-Dv8_target_arch=${arch} \ -Dv8_target_arch=${arch} \
-Dv8_use_external_startup_data=0 -Dv8_use_external_startup_data=0
@ -170,7 +172,8 @@ stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
install -vD out/Release/d8 "$out/bin/d8" install -vD out/Release/d8 "$out/bin/d8"
install -vD out/Release/mksnapshot "$out/bin/mksnapshot" install -vD out/Release/mksnapshot "$out/bin/mksnapshot"
${if stdenv.isDarwin then '' ${if static then ""
else if stdenv.isDarwin then ''
install -vD out/Release/lib.target/libv8.dylib "$out/lib/libv8.dylib" install -vD out/Release/lib.target/libv8.dylib "$out/lib/libv8.dylib"
install_name_tool -change /usr/local/lib/libv8.dylib $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc.lib}/lib/libgcc_s.1.dylib $out/bin/d8 install_name_tool -change /usr/local/lib/libv8.dylib $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc.lib}/lib/libgcc_s.1.dylib $out/bin/d8
install_name_tool -id $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc.lib}/lib/libgcc_s.1.dylib $out/lib/libv8.dylib install_name_tool -id $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc.lib}/lib/libgcc_s.1.dylib $out/lib/libv8.dylib
@ -180,6 +183,7 @@ stdenv.mkDerivation rec {
mkdir -p "$out/include" mkdir -p "$out/include"
cp -vr include/*.h "$out/include" cp -vr include/*.h "$out/include"
cp -vr include/libplatform "$out/include" cp -vr include/libplatform "$out/include"
mkdir -p "$out/lib"
cp -v out/Release/*.a "$out/lib" cp -v out/Release/*.a "$out/lib"
''; '';

2
pkgs/top-level/all-packages.nix
View File

@ -9556,6 +9556,8 @@ in
inherit (pythonPackages) gyp; inherit (pythonPackages) gyp;
}; };
v8_static = lowPrio (self.v8.override { static = true; });
vaapiIntel = callPackage ../development/libraries/vaapi-intel { vaapiIntel = callPackage ../development/libraries/vaapi-intel {
libva = libva-full; # also wants libva-{x11,drm,wayland} libva = libva-full; # also wants libva-{x11,drm,wayland}
}; };