spidermonkey_91: unpin icu, drop yasm, refactor

Split the argument list into build and runtime dependencies and sort
everything alphabetically.

Unpin icu, it works with icu70, which is the latest version at this
time.

Remove yasm, it's not needed in firefox either.
This commit is contained in:
Martin Weinelt 2022-05-21 00:06:23 +02:00
parent 0d69284baf
commit 71e22b76fc
No known key found for this signature in database
GPG key ID: 87C1E9888F856759

View file

@ -1,20 +1,24 @@
{ lib, stdenv
{ lib
, stdenv
, fetchurl
, pkg-config
, perl
, python3
, zip
# build time
, buildPackages
, cargo
, m4
, perl
, pkg-config
, python3
, 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