Merge pull request #181917 from helsinki-systems/upd/libproxy
This commit is contained in:
commit
12b5641213
|
@ -5,8 +5,8 @@
|
|||
, zlib
|
||||
, dbus
|
||||
, networkmanager
|
||||
, enableJavaScript ? stdenv.isDarwin || lib.meta.availableOn stdenv.hostPlatform spidermonkey_78
|
||||
, spidermonkey_78
|
||||
, enableJavaScript ? stdenv.isDarwin || lib.meta.availableOn stdenv.hostPlatform duktape
|
||||
, duktape
|
||||
, pcre
|
||||
, gsettings-desktop-schemas
|
||||
, glib
|
||||
|
@ -19,13 +19,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libproxy";
|
||||
version = "0.4.17";
|
||||
version = "0.4.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libproxy";
|
||||
repo = "libproxy";
|
||||
rev = version;
|
||||
sha256 = "0v8q4ln0pd5231kidpi8wpwh0chcjwcmawcki53czlpdrc09z96r";
|
||||
hash = "sha256-pqj1LwRdOK2CUu3hYIsogQIXxWzShDuKEbDTbtWkgnQ=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "py3" ];
|
||||
|
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
|
|||
python3
|
||||
zlib
|
||||
] ++ lib.optionals enableJavaScript [
|
||||
(if stdenv.hostPlatform.isDarwin then JavaScriptCore else spidermonkey_78)
|
||||
(if stdenv.hostPlatform.isDarwin then JavaScriptCore else duktape)
|
||||
] ++ (if stdenv.hostPlatform.isDarwin then [
|
||||
SystemConfiguration
|
||||
CoreFoundation
|
||||
|
|
Loading…
Reference in a new issue