From 3ff5f0eb764e42d922f22e7007db67c9bf23ae08 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 22 Mar 2022 18:03:38 +0000 Subject: 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. --- pkgs/development/interpreters/spidermonkey/78.nix | 3 +-- pkgs/development/interpreters/spidermonkey/91.nix | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'pkgs/development/interpreters/spidermonkey') diff --git a/pkgs/development/interpreters/spidermonkey/78.nix b/pkgs/development/interpreters/spidermonkey/78.nix index 4f525c8f0a5b..f2a68158266b 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 811a0247a57d..fede01c0ada7 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 -- cgit v1.2.3