diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-02-09 16:02:42 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-09 16:02:42 +0000 |
commit | 807d76b30b7e54e39ff8228e09efaea0d82ff8d7 (patch) | |
tree | 1d56909950ee5cf327171e0730cdeed66641646e /pkgs | |
parent | 814a9310dc05df88c677b8acb44303e183af35a3 (diff) | |
parent | 7f6c4e2703792d9e2405331607a8798a632eccd2 (diff) | |
download | nixlib-807d76b30b7e54e39ff8228e09efaea0d82ff8d7.tar nixlib-807d76b30b7e54e39ff8228e09efaea0d82ff8d7.tar.gz nixlib-807d76b30b7e54e39ff8228e09efaea0d82ff8d7.tar.bz2 nixlib-807d76b30b7e54e39ff8228e09efaea0d82ff8d7.tar.lz nixlib-807d76b30b7e54e39ff8228e09efaea0d82ff8d7.tar.xz nixlib-807d76b30b7e54e39ff8228e09efaea0d82ff8d7.tar.zst nixlib-807d76b30b7e54e39ff8228e09efaea0d82ff8d7.zip |
Merge pull request #34765 from greedy/fix/libproxy-darwin
libproxy: fix building on darwin
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/libproxy/default.nix | 12 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix index 614890e929f7..bf9e2d079cd6 100644 --- a/pkgs/development/libraries/libproxy/default.nix +++ b/pkgs/development/libraries/libproxy/default.nix @@ -1,5 +1,6 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake -, dbus, networkmanager, spidermonkey_38, pcre, python2, python3 }: +{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake, zlib +, dbus, networkmanager, spidermonkey_38, pcre, python2, python3 +, SystemConfiguration, CoreFoundation, JavaScriptCore }: stdenv.mkDerivation rec { name = "libproxy-${version}"; @@ -16,7 +17,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ dbus networkmanager spidermonkey_38 pcre python2 python3 ]; + buildInputs = [ pcre python2 python3 zlib ] + ++ (if stdenv.hostPlatform.isDarwin + then [ SystemConfiguration CoreFoundation JavaScriptCore ] + else [ spidermonkey_38 dbus networkmanager ]); preConfigure = '' cmakeFlagsArray+=( @@ -27,7 +31,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; license = licenses.lgpl21; homepage = http://libproxy.github.io/libproxy/; description = "A library that provides automatic proxy configuration management"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d192c3dcf4be..103debefccd9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9894,9 +9894,7 @@ with pkgs; }; libproxy = callPackage ../development/libraries/libproxy { - stdenv = if stdenv.isDarwin - then overrideCC stdenv gcc - else stdenv; + inherit (darwin.apple_sdk.frameworks) SystemConfiguration CoreFoundation JavaScriptCore; }; libpseudo = callPackage ../development/libraries/libpseudo { }; |