diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2017-09-25 16:45:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-25 16:45:09 +0200 |
| commit | b986c8e510e1b21d946b83b8c882d52c0b6b5368 (patch) | |
| tree | 396df4d0b883e8dc07796a2d6263c5bcd4047411 /pkgs/development | |
| parent | 799c1218cd31e9d16d3ff36d5ab0208c26250944 (diff) | |
| parent | 30c380556ca5959da6732db5ee13cfb7b28a8a5e (diff) | |
| download | nixlib-b986c8e510e1b21d946b83b8c882d52c0b6b5368.tar nixlib-b986c8e510e1b21d946b83b8c882d52c0b6b5368.tar.gz nixlib-b986c8e510e1b21d946b83b8c882d52c0b6b5368.tar.bz2 nixlib-b986c8e510e1b21d946b83b8c882d52c0b6b5368.tar.lz nixlib-b986c8e510e1b21d946b83b8c882d52c0b6b5368.tar.xz nixlib-b986c8e510e1b21d946b83b8c882d52c0b6b5368.tar.zst nixlib-b986c8e510e1b21d946b83b8c882d52c0b6b5368.zip | |
Merge pull request #29776 from Mic92/libproxy
libproxy: 0.4.13 -> 0.4.15
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/libproxy/default.nix | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix index c493dd678ad5..614890e929f7 100644 --- a/pkgs/development/libraries/libproxy/default.nix +++ b/pkgs/development/libraries/libproxy/default.nix @@ -1,28 +1,30 @@ { stdenv, lib, fetchFromGitHub, pkgconfig, cmake -, dbus, networkmanager, webkitgtk216x, pcre, python2 }: +, dbus, networkmanager, spidermonkey_38, pcre, python2, python3 }: stdenv.mkDerivation rec { name = "libproxy-${version}"; - version = "0.4.13"; + version = "0.4.15"; src = fetchFromGitHub { owner = "libproxy"; repo = "libproxy"; rev = version; - sha256 = "0yg4wr44ync6x3p107ic00m1l04xqhni9jn1vzvkw3nfjd0k6f92"; + sha256 = "10swd3x576pinx33iwsbd4h15fbh2snmfxzcmab4c56nb08qlbrs"; }; outputs = [ "out" "dev" ]; # to deal with propagatedBuildInputs nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ dbus networkmanager webkitgtk216x pcre ]; + buildInputs = [ dbus networkmanager spidermonkey_38 pcre python2 python3 ]; - cmakeFlags = [ - "-DWITH_WEBKIT3=ON" - "-DWITH_MOZJS=OFF" - "-DPYTHON_SITEPKG_DIR=$(out)/${python2.sitePackages}" - ]; + preConfigure = '' + cmakeFlagsArray+=( + "-DWITH_MOZJS=ON" + "-DPYTHON2_SITEPKG_DIR=$out/${python2.sitePackages}" + "-DPYTHON3_SITEPKG_DIR=$out/${python3.sitePackages}" + ) + ''; meta = with stdenv.lib; { platforms = platforms.linux; |