about summary refs log tree commit diff
diff options
context:
space:
mode:
authorNicolas B. Pierron <nicolas.b.pierron@nbp.name>2018-10-04 12:01:22 +0200
committerNicolas B. Pierron <nicolas.b.pierron@gmail.com>2018-10-04 12:06:10 +0200
commita7159e93ca1374dfae8389dfc6d966fb37b50903 (patch)
treee28dffab8130574af24d5120401bf6b867f26418
parentb9c99d043b1cb55ee8c08265223b7c35d687acb9 (diff)
downloadnixlib-a7159e93ca1374dfae8389dfc6d966fb37b50903.tar
nixlib-a7159e93ca1374dfae8389dfc6d966fb37b50903.tar.gz
nixlib-a7159e93ca1374dfae8389dfc6d966fb37b50903.tar.bz2
nixlib-a7159e93ca1374dfae8389dfc6d966fb37b50903.tar.lz
nixlib-a7159e93ca1374dfae8389dfc6d966fb37b50903.tar.xz
nixlib-a7159e93ca1374dfae8389dfc6d966fb37b50903.tar.zst
nixlib-a7159e93ca1374dfae8389dfc6d966fb37b50903.zip
Add 2 environment variables to be used when compiling the JS Shell with Cranelift.
-rw-r--r--pkgs/gecko/default.nix5
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/gecko/default.nix b/pkgs/gecko/default.nix
index 6db9e1f1fe14..0fa3ac8ece7a 100644
--- a/pkgs/gecko/default.nix
+++ b/pkgs/gecko/default.nix
@@ -113,6 +113,11 @@ let
     export MOZBUILD_STATE_PATH=$PWD/.mozbuild
     export CC="${stdenv.cc}/bin/cc";
     export CXX="${stdenv.cc}/bin/c++";
+    # To be used when building the JS Shell.
+    export NIX_EXTRA_CONFIGURE_ARGS="--with-libclang-path=${llvmPackages.clang.cc.lib}/lib --with-clang-path=${llvmPackages.clang}/bin/clang"
+    cxxLib=$( echo -n ${gcc}/include/c++/* )
+    archLib=$cxxLib/$( ${gcc}/bin/gcc -dumpmachine )
+    export BINDGEN_CFLAGS="-cxx-isystem $cxxLib -isystem $archLib"
     ${genMozConfig}
     ${builtins.getEnv "NIX_SHELL_HOOK"}
   '';