diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-09-02 22:37:31 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-09-03 16:11:39 +0200 |
| commit | e9953b602c673f1d0524b4df06bd796d8a89feb8 (patch) | |
| tree | 157eb85ed14284d92e4f73cd4d2b6e771ab24406 /pkgs/development/libraries/libproxy | |
| parent | d0ddf6415a6db51695620bce3d3c793b450ad6c6 (diff) | |
| download | nixpkgs-e9953b602c673f1d0524b4df06bd796d8a89feb8.tar nixpkgs-e9953b602c673f1d0524b4df06bd796d8a89feb8.tar.gz nixpkgs-e9953b602c673f1d0524b4df06bd796d8a89feb8.tar.bz2 nixpkgs-e9953b602c673f1d0524b4df06bd796d8a89feb8.tar.lz nixpkgs-e9953b602c673f1d0524b4df06bd796d8a89feb8.tar.xz nixpkgs-e9953b602c673f1d0524b4df06bd796d8a89feb8.tar.zst nixpkgs-e9953b602c673f1d0524b4df06bd796d8a89feb8.zip | |
libproxy: format with nixpkgs-fmt
Diffstat (limited to 'pkgs/development/libraries/libproxy')
| -rw-r--r-- | pkgs/development/libraries/libproxy/default.nix | 47 |
1 files changed, 37 insertions, 10 deletions
diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix index 78709edff64..16c90d0a150 100644 --- a/pkgs/development/libraries/libproxy/default.nix +++ b/pkgs/development/libraries/libproxy/default.nix @@ -1,6 +1,19 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, zlib, fetchpatch -, dbus, networkmanager, spidermonkey_38, pcre, python2, python3 -, SystemConfiguration, CoreFoundation, JavaScriptCore }: +{ stdenv +, fetchFromGitHub +, pkgconfig +, cmake +, zlib +, fetchpatch +, dbus +, networkmanager +, spidermonkey_38 +, pcre +, python2 +, python3 +, SystemConfiguration +, CoreFoundation +, JavaScriptCore +}: stdenv.mkDerivation rec { pname = "libproxy"; @@ -15,12 +28,25 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "py2" "py3" ]; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ + pkgconfig + cmake + ]; - buildInputs = [ pcre python2 python3 zlib ] - ++ (if stdenv.hostPlatform.isDarwin - then [ SystemConfiguration CoreFoundation JavaScriptCore ] - else [ spidermonkey_38 dbus networkmanager ]); + buildInputs = [ + pcre + python2 + python3 + zlib + ] ++ (if stdenv.hostPlatform.isDarwin then [ + SystemConfiguration + CoreFoundation + JavaScriptCore + ] else [ + spidermonkey_38 + dbus + networkmanager + ]); cmakeFlags = [ "-DWITH_MOZJS=ON" @@ -28,11 +54,12 @@ stdenv.mkDerivation rec { "-DPYTHON3_SITEPKG_DIR=${placeholder "py3"}/${python3.sitePackages}" ]; - patches = stdenv.lib.optional stdenv.isDarwin + patches = stdenv.lib.optionals stdenv.isDarwin [ (fetchpatch { url = "https://github.com/libproxy/libproxy/commit/44158f03f8522116758d335688ed840dfcb50ac8.patch"; sha256 = "0axfvb6j7gcys6fkwi9dkn006imhvm3kqr83gpwban8419n0q5v1"; - }); + }) + ]; doCheck = false; # fails 1 out of 10 tests |