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

Merge pull request #35333 from mdorman/connman-fix 

connman: fix build with upstream patch
This commit is contained in:
Franz Pletz 2018-02-23 04:16:37 +00:00 committed by GitHub
parent 278bc22498 2977296f37
commit d16274da1d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/tools/networking/connman/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, openconnect, file, gawk, { stdenv, fetchurl, fetchpatch, pkgconfig, openconnect, file, gawk,
openvpn, vpnc, glib, dbus, iptables, gnutls, polkit, openvpn, vpnc, glib, dbus, iptables, gnutls, polkit,
wpa_supplicant, readline6, pptp, ppp }: wpa_supplicant, readline6, pptp, ppp }:
@ -16,6 +16,14 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig file gawk ]; nativeBuildInputs = [ pkgconfig file gawk ];
patches = [
(fetchpatch {
name = "header-include.patch";
url = "https://git.kernel.org/pub/scm/network/connman/connman.git/patch/?id=bdfb3526466f8fb8f13d9259037d8f42c782ce24";
sha256 = "0q6ysy2xvvcmkcbw1y29x90g7g7kih7v95k1xbxdcxkras5yl8nf";
})
];
preConfigure = '' preConfigure = ''
export WPASUPPLICANT=${wpa_supplicant}/sbin/wpa_supplicant export WPASUPPLICANT=${wpa_supplicant}/sbin/wpa_supplicant
export PPPD=${ppp}/sbin/pppd export PPPD=${ppp}/sbin/pppd