diff options
| author | Martin Weinelt <mweinelt@users.noreply.github.com> | 2022-05-22 11:57:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-22 11:57:53 +0200 |
| commit | 814a08cdfb4f701097d54011e64290fe10771014 (patch) | |
| tree | bd5dc4d794b5c39011a120f105e02b8926b95a90 /pkgs/development/interpreters/spidermonkey | |
| parent | e8ed9b5550268fe5600a9c758d01dfc487929fb3 (diff) | |
| parent | 71e22b76fcf17baa28a463b8a3168848c36f06ce (diff) | |
Merge pull request #173810 from mweinelt/spidermonkey
spidermonkey_91: unpin icu, drop yasm, refactor
Diffstat (limited to 'pkgs/development/interpreters/spidermonkey')
| -rw-r--r-- | pkgs/development/interpreters/spidermonkey/91.nix | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/pkgs/development/interpreters/spidermonkey/91.nix b/pkgs/development/interpreters/spidermonkey/91.nix index ee8557f49c975..ff60044488e3a 100644 --- a/pkgs/development/interpreters/spidermonkey/91.nix +++ b/pkgs/development/interpreters/spidermonkey/91.nix @@ -1,20 +1,24 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl -, pkg-config + +# build time +, buildPackages +, cargo +, m4 , perl +, pkg-config , python3 -, zip -, buildPackages +, rust-cbindgen +, rustc , which +, zip + +# runtime +, icu +, nspr , readline , zlib -, icu69 -, cargo -, rustc -, rust-cbindgen -, yasm -, nspr -, m4 }: stdenv.mkDerivation rec { @@ -31,20 +35,19 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cargo - rustc.llvmPackages.llvm # for llvm-objdump + m4 perl pkg-config python3 rust-cbindgen rustc + rustc.llvmPackages.llvm # for llvm-objdump which - yasm # to buid icu? seems weird zip - m4 ]; buildInputs = [ - icu69 + icu nspr readline zlib |