diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-05-07 19:29:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-07 19:29:06 +0200 |
| commit | a80982b4c9e5dc9a34973638d62b0c748bef4eec (patch) | |
| tree | 2d2d426102de35f584636864dd5228b509de6a6a /pkgs/development/libraries/libproxy/default.nix | |
| parent | 6ae8aed1c2ec25a523c809bb5b0c3e3e89d0bb5e (diff) | |
| parent | 0196d8f11cff9790531f7599153a077bb493b9cf (diff) | |
| download | nixlib-a80982b4c9e5dc9a34973638d62b0c748bef4eec.tar nixlib-a80982b4c9e5dc9a34973638d62b0c748bef4eec.tar.gz nixlib-a80982b4c9e5dc9a34973638d62b0c748bef4eec.tar.bz2 nixlib-a80982b4c9e5dc9a34973638d62b0c748bef4eec.tar.lz nixlib-a80982b4c9e5dc9a34973638d62b0c748bef4eec.tar.xz nixlib-a80982b4c9e5dc9a34973638d62b0c748bef4eec.tar.zst nixlib-a80982b4c9e5dc9a34973638d62b0c748bef4eec.zip | |
Merge staging-next into master
Diffstat (limited to 'pkgs/development/libraries/libproxy/default.nix')
| -rw-r--r-- | pkgs/development/libraries/libproxy/default.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix index 0e0499251eb9..3b050c3dc6a0 100644 --- a/pkgs/development/libraries/libproxy/default.nix +++ b/pkgs/development/libraries/libproxy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, zlib +{ stdenv, fetchFromGitHub, pkgconfig, cmake, zlib, fetchpatch , dbus, networkmanager, spidermonkey_38, pcre, python2, python3 , SystemConfiguration, CoreFoundation, JavaScriptCore }: @@ -30,6 +30,12 @@ stdenv.mkDerivation rec { ) ''; + patches = stdenv.lib.optional stdenv.isDarwin + (fetchpatch { + url = "https://github.com/libproxy/libproxy/commit/44158f03f8522116758d335688ed840dfcb50ac8.patch"; + sha256 = "0axfvb6j7gcys6fkwi9dkn006imhvm3kqr83gpwban8419n0q5v1"; + }); + doCheck = false; # fails 1 out of 10 tests meta = with stdenv.lib; { |