Merge pull request #34765 from greedy/fix/libproxy-darwin

libproxy: fix building on darwin

Changed files
+9 -7
pkgs
development
libraries
libproxy
top-level
+8 -4
pkgs/development/libraries/libproxy/default.nix
···
-
{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake
-
, dbus, networkmanager, spidermonkey_38, pcre, python2, python3 }:
stdenv.mkDerivation rec {
name = "libproxy-${version}";
···
nativeBuildInputs = [ pkgconfig cmake ];
-
buildInputs = [ dbus networkmanager spidermonkey_38 pcre python2 python3 ];
preConfigure = ''
cmakeFlagsArray+=(
···
'';
meta = with stdenv.lib; {
-
platforms = platforms.linux;
license = licenses.lgpl21;
homepage = http://libproxy.github.io/libproxy/;
description = "A library that provides automatic proxy configuration management";
···
+
{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake, zlib
+
, dbus, networkmanager, spidermonkey_38, pcre, python2, python3
+
, SystemConfiguration, CoreFoundation, JavaScriptCore }:
stdenv.mkDerivation rec {
name = "libproxy-${version}";
···
nativeBuildInputs = [ pkgconfig cmake ];
+
buildInputs = [ pcre python2 python3 zlib ]
+
++ (if stdenv.hostPlatform.isDarwin
+
then [ SystemConfiguration CoreFoundation JavaScriptCore ]
+
else [ spidermonkey_38 dbus networkmanager ]);
preConfigure = ''
cmakeFlagsArray+=(
···
'';
meta = with stdenv.lib; {
+
platforms = platforms.linux ++ platforms.darwin;
license = licenses.lgpl21;
homepage = http://libproxy.github.io/libproxy/;
description = "A library that provides automatic proxy configuration management";
+1 -3
pkgs/top-level/all-packages.nix
···
};
libproxy = callPackage ../development/libraries/libproxy {
-
stdenv = if stdenv.isDarwin
-
then overrideCC stdenv gcc
-
else stdenv;
};
libpseudo = callPackage ../development/libraries/libpseudo { };
···
};
libproxy = callPackage ../development/libraries/libproxy {
+
inherit (darwin.apple_sdk.frameworks) SystemConfiguration CoreFoundation JavaScriptCore;
};
libpseudo = callPackage ../development/libraries/libpseudo { };