diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-09-30 11:02:01 -0400 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-10-03 00:09:20 +0200 |
| commit | 7543b25e3746c7e2880f5cebeb8f1ff0be02bef6 (patch) | |
| tree | 01d3d5305ad877fbc0186df19af7d7eefb44ec6c /pkgs/development/libraries/libproxy | |
| parent | 4b3942b75ab64fb46a3cedc62556ac3fb153c72b (diff) | |
| download | nixpkgs-7543b25e3746c7e2880f5cebeb8f1ff0be02bef6.tar nixpkgs-7543b25e3746c7e2880f5cebeb8f1ff0be02bef6.tar.gz nixpkgs-7543b25e3746c7e2880f5cebeb8f1ff0be02bef6.tar.bz2 nixpkgs-7543b25e3746c7e2880f5cebeb8f1ff0be02bef6.tar.lz nixpkgs-7543b25e3746c7e2880f5cebeb8f1ff0be02bef6.tar.xz nixpkgs-7543b25e3746c7e2880f5cebeb8f1ff0be02bef6.tar.zst nixpkgs-7543b25e3746c7e2880f5cebeb8f1ff0be02bef6.zip | |
libproxy: build with spidermonkey_60
Diffstat (limited to 'pkgs/development/libraries/libproxy')
| -rw-r--r-- | pkgs/development/libraries/libproxy/default.nix | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix index 773acd03535..c9b08079c38 100644 --- a/pkgs/development/libraries/libproxy/default.nix +++ b/pkgs/development/libraries/libproxy/default.nix @@ -6,7 +6,7 @@ , fetchpatch , dbus , networkmanager -, spidermonkey_38 +, spidermonkey_60 , pcre , gsettings-desktop-schemas , glib @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { JavaScriptCore ] else [ glib - spidermonkey_38 + spidermonkey_60 dbus networkmanager ]); @@ -59,7 +59,21 @@ stdenv.mkDerivation rec { "-DPYTHON3_SITEPKG_DIR=${placeholder "py3"}/${python3.sitePackages}" ]; - patches = stdenv.lib.optionals stdenv.isDarwin [ + patches = [ + # Make build with spidermonkey_60 + (fetchpatch { + url = "https://github.com/libproxy/libproxy/pull/86.patch"; + sha256 = "17c06ilinrnzr7xnnmw9pc6zrncyaxcdd6r6k1ah5p156skbykfs"; + }) + (fetchpatch { + url = "https://github.com/libproxy/libproxy/pull/87.patch"; + sha256 = "0sagzfwm16f33inbkwsp88w9wmrd034rjmw0y8d122f7k1qfx6zc"; + }) + (fetchpatch { + url = "https://github.com/libproxy/libproxy/pull/95.patch"; + sha256 = "18vyr6wlis9zfwml86606jpgb9mss01l9aj31iiciml8p857aixi"; + }) + ] ++ stdenv.lib.optionals stdenv.isDarwin [ (fetchpatch { url = "https://github.com/libproxy/libproxy/commit/44158f03f8522116758d335688ed840dfcb50ac8.patch"; sha256 = "0axfvb6j7gcys6fkwi9dkn006imhvm3kqr83gpwban8419n0q5v1"; |