From 30ada3e6aff2ea1731358d511d5e124d64650b6c Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 9 Jul 2021 09:23:56 +0000 Subject: [PATCH] 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. --- pkgs/development/interpreters/spidermonkey/68.nix | 12 +++++++++--- 1 file 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