libproxy: build with spidermonkey_60
This commit is contained in:
parent
4b3942b75a
commit
7543b25e37
1 changed files with 17 additions and 3 deletions
|
@ -6,7 +6,7 @@
|
||||||
, fetchpatch
|
, fetchpatch
|
||||||
, dbus
|
, dbus
|
||||||
, networkmanager
|
, networkmanager
|
||||||
, spidermonkey_38
|
, spidermonkey_60
|
||||||
, pcre
|
, pcre
|
||||||
, gsettings-desktop-schemas
|
, gsettings-desktop-schemas
|
||||||
, glib
|
, glib
|
||||||
|
@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
|
||||||
JavaScriptCore
|
JavaScriptCore
|
||||||
] else [
|
] else [
|
||||||
glib
|
glib
|
||||||
spidermonkey_38
|
spidermonkey_60
|
||||||
dbus
|
dbus
|
||||||
networkmanager
|
networkmanager
|
||||||
]);
|
]);
|
||||||
|
@ -59,7 +59,21 @@ stdenv.mkDerivation rec {
|
||||||
"-DPYTHON3_SITEPKG_DIR=${placeholder "py3"}/${python3.sitePackages}"
|
"-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 {
|
(fetchpatch {
|
||||||
url = "https://github.com/libproxy/libproxy/commit/44158f03f8522116758d335688ed840dfcb50ac8.patch";
|
url = "https://github.com/libproxy/libproxy/commit/44158f03f8522116758d335688ed840dfcb50ac8.patch";
|
||||||
sha256 = "0axfvb6j7gcys6fkwi9dkn006imhvm3kqr83gpwban8419n0q5v1";
|
sha256 = "0axfvb6j7gcys6fkwi9dkn006imhvm3kqr83gpwban8419n0q5v1";
|
||||||
|
|
Loading…
Reference in a new issue