about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorJörg Thalheim <joerg@thalheim.io>2017-04-04 13:37:55 +0200
committerJörg Thalheim <joerg@thalheim.io>2017-04-04 17:00:40 +0200
commit43c0530ca6017dea25e0676cbcf4059dbb7e5d08 (patch)
tree69ce1626b2094c1907349d7c1e9fb9ff193bafe0 /pkgs
parent9987abca8e644f75844c8ff0f8f8fb427d2e38fd (diff)
downloadnixlib-43c0530ca6017dea25e0676cbcf4059dbb7e5d08.tar
nixlib-43c0530ca6017dea25e0676cbcf4059dbb7e5d08.tar.gz
nixlib-43c0530ca6017dea25e0676cbcf4059dbb7e5d08.tar.bz2
nixlib-43c0530ca6017dea25e0676cbcf4059dbb7e5d08.tar.lz
nixlib-43c0530ca6017dea25e0676cbcf4059dbb7e5d08.tar.xz
nixlib-43c0530ca6017dea25e0676cbcf4059dbb7e5d08.tar.zst
nixlib-43c0530ca6017dea25e0676cbcf4059dbb7e5d08.zip
libproxy: fix compilation
also use webkit backend (webkitgtk is also a more common gnome/gtk)
Changelog: https://cgit.freedesktop.org/NetworkManager/NetworkManager/tree/NEWS?h=1.6.2
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/libraries/libproxy/default.nix10
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix
index 97929d29b377..163357a0c0f8 100644
--- a/pkgs/development/libraries/libproxy/default.nix
+++ b/pkgs/development/libraries/libproxy/default.nix
@@ -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;