BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #29776 from Mic92/libproxy

Browse source 
libproxy: 0.4.13 -> 0.4.15
This commit is contained in:
Eelco Dolstra 2017-09-25 16:45:09 +02:00 committed by GitHub
commit b986c8e510
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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