swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 12:59:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

libproxy: format with nixpkgs-fmt

Browse source
This commit is contained in:
Jan Tojnar 2019-09-02 22:37:31 +02:00
parent d0ddf6415a
commit e9953b602c
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4
1 changed files with 37 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
pkgs/development/libraries/libproxy/default.nix
View file

@ -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