diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2021-07-11 16:11:09 +0200 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2021-07-11 16:11:09 +0200 |
| commit | bcda9c8cfc7b1522f21b6ea051dae647e4e69bf5 (patch) | |
| tree | f92e0da70d6bb01855f31cede6b8c9b138bd488a /pkgs/development/interpreters | |
| parent | b7e408dd17f6868ff5d3f50d4b44eaee067412cc (diff) | |
| parent | 15ddd8316a81c32b55b318ea69c97505d27e793b (diff) | |
| download | nixlib-bcda9c8cfc7b1522f21b6ea051dae647e4e69bf5.tar nixlib-bcda9c8cfc7b1522f21b6ea051dae647e4e69bf5.tar.gz nixlib-bcda9c8cfc7b1522f21b6ea051dae647e4e69bf5.tar.bz2 nixlib-bcda9c8cfc7b1522f21b6ea051dae647e4e69bf5.tar.lz nixlib-bcda9c8cfc7b1522f21b6ea051dae647e4e69bf5.tar.xz nixlib-bcda9c8cfc7b1522f21b6ea051dae647e4e69bf5.tar.zst nixlib-bcda9c8cfc7b1522f21b6ea051dae647e4e69bf5.zip | |
Merge remote-tracking branch 'origin/master' into staging-next
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/spidermonkey/68.nix | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/development/interpreters/spidermonkey/68.nix b/pkgs/development/interpreters/spidermonkey/68.nix index f867e606140f..ccb9271bd40a 100644 --- a/pkgs/development/interpreters/spidermonkey/68.nix +++ b/pkgs/development/interpreters/spidermonkey/68.nix @@ -14,6 +14,15 @@ in stdenv.mkDerivation rec { sha256 = "0azdinwqjfv2q37gqpxmfvzsk86pvsi6cjaq1310zs26gric5j1f"; }; + patches = [ + # Backport a change from Firefox 75 that fixes finding the + # location of clang and libclang. + (fetchpatch { + url = "https://hg.mozilla.org/mozilla-central/raw-rev/ccd1356fc8f1d0bfa9d896e88d3cc924425623da"; + sha256 = "005g3mfmal9nw32khrgyiv3221z7pazfhhm2qvgc8d48i2yzj3j0"; + }) + ]; + outputs = [ "out" "dev" ]; setOutputFlags = false; # Configure script only understands --includedir @@ -55,9 +64,6 @@ in stdenv.mkDerivation rec { "--with-system-zlib" "--with-system-icu" - "--with-libclang-path=${llvmPackages.libclang.lib}/lib" - "--with-clang-path=${llvmPackages.clang}/bin/clang" - "--enable-shared-js" "--enable-readline" # Fedora and Arch disable optimize, but it doesn't seme to be necessary |