diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-03-22 18:03:38 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-03-22 20:40:54 +0000 |
| commit | 3ff5f0eb764e42d922f22e7007db67c9bf23ae08 (patch) | |
| tree | 1071f37e34e12b1687d02b83399935e678e5ca76 | |
| parent | 07b832716c62875622466a21f50961446139c722 (diff) | |
| download | nixpkgs-3ff5f0eb764e42d922f22e7007db67c9bf23ae08.tar nixpkgs-3ff5f0eb764e42d922f22e7007db67c9bf23ae08.tar.gz nixpkgs-3ff5f0eb764e42d922f22e7007db67c9bf23ae08.tar.bz2 nixpkgs-3ff5f0eb764e42d922f22e7007db67c9bf23ae08.tar.lz nixpkgs-3ff5f0eb764e42d922f22e7007db67c9bf23ae08.tar.xz nixpkgs-3ff5f0eb764e42d922f22e7007db67c9bf23ae08.tar.zst nixpkgs-3ff5f0eb764e42d922f22e7007db67c9bf23ae08.zip | |
spidermonkey: use the same LLVM as rustc
Spidermonkey depends on rustc, so we have the best chance at only having a single LLVM in the build closure if we use the same LLVM that rustc depends on.
| -rw-r--r-- | pkgs/development/interpreters/spidermonkey/78.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/interpreters/spidermonkey/91.nix | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/development/interpreters/spidermonkey/78.nix b/pkgs/development/interpreters/spidermonkey/78.nix index 4f525c8f0a5..f2a68158266 100644 --- a/pkgs/development/interpreters/spidermonkey/78.nix +++ b/pkgs/development/interpreters/spidermonkey/78.nix @@ -15,7 +15,6 @@ , rustc , rust-cbindgen , yasm -, llvmPackages_12 , nspr }: @@ -52,7 +51,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf213 cargo - llvmPackages_12.llvm # for llvm-objdump + rustc.llvmPackages.llvm # for llvm-objdump perl pkg-config python3 diff --git a/pkgs/development/interpreters/spidermonkey/91.nix b/pkgs/development/interpreters/spidermonkey/91.nix index 811a0247a57..fede01c0ada 100644 --- a/pkgs/development/interpreters/spidermonkey/91.nix +++ b/pkgs/development/interpreters/spidermonkey/91.nix @@ -13,7 +13,6 @@ , rustc , rust-cbindgen , yasm -, llvmPackages_latest , nspr , m4 }: @@ -32,7 +31,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cargo - llvmPackages_latest.llvm # for llvm-objdump + rustc.llvmPackages.llvm # for llvm-objdump perl pkg-config python3 |