From 71e22b76fcf17baa28a463b8a3168848c36f06ce Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 21 May 2022 00:06:23 +0200 Subject: [PATCH] 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. --- .../interpreters/spidermonkey/91.nix | 33 ++++++++++--------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/pkgs/development/interpreters/spidermonkey/91.nix b/pkgs/development/interpreters/spidermonkey/91.nix index f1f5c7bb56a..025c0549863 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