diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2022-01-04 09:10:53 +0100 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2022-02-02 18:57:15 +0100 |
| commit | c9815cd3039fc4bae56b6729800634b3eb722bec (patch) | |
| tree | 687523e1fdaae7de13a7968a8fd177917da771ca | |
| parent | b41beef827945f530111320b2fbc515871933c67 (diff) | |
| download | nixpkgs-c9815cd3039fc4bae56b6729800634b3eb722bec.tar nixpkgs-c9815cd3039fc4bae56b6729800634b3eb722bec.tar.gz nixpkgs-c9815cd3039fc4bae56b6729800634b3eb722bec.tar.bz2 nixpkgs-c9815cd3039fc4bae56b6729800634b3eb722bec.tar.lz nixpkgs-c9815cd3039fc4bae56b6729800634b3eb722bec.tar.xz nixpkgs-c9815cd3039fc4bae56b6729800634b3eb722bec.tar.zst nixpkgs-c9815cd3039fc4bae56b6729800634b3eb722bec.zip | |
libproxy: upgrade spidermonkey
| -rw-r--r-- | pkgs/development/libraries/libproxy/default.nix | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix index c5d6bc4612f..f6bf1e81668 100644 --- a/pkgs/development/libraries/libproxy/default.nix +++ b/pkgs/development/libraries/libproxy/default.nix @@ -5,8 +5,8 @@ , zlib , dbus , networkmanager -, enableJavaScript ? stdenv.isDarwin || lib.meta.availableOn stdenv.hostPlatform spidermonkey_68 -, spidermonkey_68 +, enableJavaScript ? stdenv.isDarwin || lib.meta.availableOn stdenv.hostPlatform spidermonkey_78 +, spidermonkey_78 , pcre , gsettings-desktop-schemas , glib @@ -17,9 +17,7 @@ , JavaScriptCore }: -let - jsRuntime = if stdenv.hostPlatform.isDarwin then JavaScriptCore else spidermonkey_68; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "libproxy"; version = "0.4.17"; @@ -43,7 +41,7 @@ in stdenv.mkDerivation rec { python3 zlib ] ++ lib.optionals enableJavaScript [ - jsRuntime + (if stdenv.hostPlatform.isDarwin then JavaScriptCore else spidermonkey_78) ] ++ (if stdenv.hostPlatform.isDarwin then [ SystemConfiguration CoreFoundation |