From c9815cd3039fc4bae56b6729800634b3eb722bec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 4 Jan 2022 09:10:53 +0100 Subject: [PATCH] libproxy: upgrade spidermonkey --- pkgs/development/libraries/libproxy/default.nix | 10 ++++------ 1 file 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