pyrox.dev
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.
+9
-3
pkgs/development/interpreters/spidermonkey/68.nix
+9
-3
pkgs/development/interpreters/spidermonkey/68.nix
···
14
sha256 = "0azdinwqjfv2q37gqpxmfvzsk86pvsi6cjaq1310zs26gric5j1f";
15
};
16
17
outputs = [ "out" "dev" ];
18
setOutputFlags = false; # Configure script only understands --includedir
19
···
54
"--enable-posix-nspr-emulation"
55
"--with-system-zlib"
56
"--with-system-icu"
57
-
58
-
"--with-libclang-path=${llvmPackages.libclang.lib}/lib"
59
-
"--with-clang-path=${llvmPackages.clang}/bin/clang"
60
61
"--enable-shared-js"
62
"--enable-readline"
···
14
sha256 = "0azdinwqjfv2q37gqpxmfvzsk86pvsi6cjaq1310zs26gric5j1f";
15
};
16
17
+
patches = [
18
+
# Backport a change from Firefox 75 that fixes finding the
19
+
# location of clang and libclang.
20
+
(fetchpatch {
21
+
url = "https://hg.mozilla.org/mozilla-central/raw-rev/ccd1356fc8f1d0bfa9d896e88d3cc924425623da";
22
+
sha256 = "005g3mfmal9nw32khrgyiv3221z7pazfhhm2qvgc8d48i2yzj3j0";
23
+
})
24
+
];
25
+
26
outputs = [ "out" "dev" ];
27
setOutputFlags = false; # Configure script only understands --includedir
28
···
63
"--enable-posix-nspr-emulation"
64
"--with-system-zlib"
65
"--with-system-icu"
66
67
"--enable-shared-js"
68
"--enable-readline"