public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #24625 from Mic92/networkmanager

Browse Source 
networkmanager: 1.4.4 -> 1.6.4
This commit is contained in:
Jörg Thalheim
2017-04-05 12:49:58 +02:00
committed by GitHub
parent 26084166c3 b552de7525
commit 052cd88921
5 changed files with 47 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/libraries/libproxy/default.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake
, dbus, networkmanager, spidermonkey_1_8_5 }:
, dbus, networkmanager, webkitgtk214x, pcre, python2 }:
stdenv.mkDerivation rec {
name = "libproxy-${version}";
@@ -16,7 +16,13 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig cmake ];
buildInputs = [ dbus networkmanager spidermonkey_1_8_5 ];
buildInputs = [ dbus networkmanager webkitgtk214x pcre ];
cmakeFlags = [
"-DWITH_WEBKIT3=ON"
"-DWITH_MOZJS=OFF"
"-DPYTHON_SITEPKG_DIR=$(out)/${python2.sitePackages}"
];
meta = with stdenv.lib; {
platforms = platforms.linux;