Merge pull request #173810 from mweinelt/spidermonkey

spidermonkey_91: unpin icu, drop yasm, refactor
main
Martin Weinelt 2 years ago committed by GitHub
commit 814a08cdfb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 33
      pkgs/development/interpreters/spidermonkey/91.nix

@ -1,20 +1,24 @@
{ lib, stdenv { lib
, stdenv
, fetchurl , fetchurl
, pkg-config
# build time
, buildPackages
, cargo
, m4
, perl , perl
, pkg-config
, python3 , python3
, zip , rust-cbindgen
, buildPackages , rustc
, which , which
, zip
# runtime
, icu
, nspr
, readline , readline
, zlib , zlib
, icu69
, cargo
, rustc
, rust-cbindgen
, yasm
, nspr
, m4
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -31,20 +35,19 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
cargo cargo
rustc.llvmPackages.llvm # for llvm-objdump m4
perl perl
pkg-config pkg-config
python3 python3
rust-cbindgen rust-cbindgen
rustc rustc
rustc.llvmPackages.llvm # for llvm-objdump
which which
yasm # to buid icu? seems weird
zip zip
m4
]; ];
buildInputs = [ buildInputs = [
icu69 icu
nspr nspr
readline readline
zlib zlib

Loading…
Cancel
Save