diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-07-09 09:23:56 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-07-11 12:11:54 +0000 |
| commit | 30ada3e6aff2ea1731358d511d5e124d64650b6c (patch) | |
| tree | 521e9acf674bff0f670ab54ffef348207d4e713e /pkgs/development/interpreters/spidermonkey | |
| parent | 15586a40557a9d3b1822ed4a9241b3c797d8a52a (diff) | |
spidermonkey_68: fix cross
The use of unspliced llvmPackages in configureFlags was causing an eval failure when cross-compiling, but since later versions of Firefox/Spidermonkey can correctly detect clang and libclang without those arguments being specified, we can just backport that patch (which applies cleanly), and not have to worry about it any more.
Diffstat (limited to 'pkgs/development/interpreters/spidermonkey')
| -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 f867e606140f5..ccb9271bd40a2 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 |