diff options
| author | Alexander Ried <ried@mytum.de> | 2016-05-03 20:03:14 +0200 |
|---|---|---|
| committer | Alexander Ried <ried@mytum.de> | 2016-05-03 20:10:54 +0200 |
| commit | b95eebec653c749cbc2c2b3932d5b075d566e9b5 (patch) | |
| tree | 81adcf23dffeb53010ba771f8a66d76b4530f54c /pkgs/tools/networking/connman | |
| parent | 6d55b2e9c0a8bd72cb4375c55a5789682cb96b1c (diff) | |
connman: 1.31 -> 1.32
fetch release tarball instead of git checkout and drop autotools
This update is compatible with iptables 1.6.0 (see #12178)
Diffstat (limited to 'pkgs/tools/networking/connman')
| -rw-r--r-- | pkgs/tools/networking/connman/default.nix | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix index 7af692f782e8..f8abdb33d9d6 100644 --- a/pkgs/tools/networking/connman/default.nix +++ b/pkgs/tools/networking/connman/default.nix @@ -1,26 +1,25 @@ -{ stdenv, fetchgit, autoconf, automake, libtool, pkgconfig, openconnect, file, +{ stdenv, fetchurl, pkgconfig, openconnect, file, openvpn, vpnc, glib, dbus, iptables, gnutls, polkit, - wpa_supplicant, readline6, pptp, ppp, tree }: + wpa_supplicant, readline6, pptp, ppp }: stdenv.mkDerivation rec { name = "connman-${version}"; - version = "1.31"; - src = fetchgit { - url = "git://git.kernel.org/pub/scm/network/connman/connman.git"; - rev = "refs/tags/${version}"; - sha256 = "90dab6b11841cb4b6400711d234b59fb4fad4e8778bed6e7ad3ac7ac135d6893"; + version = "1.32"; + src = fetchurl { + url = "mirror://kernel/linux/network/connman/${name}.tar.xz"; + sha256 = "0k4kw2j78gwxf0rq79a099qkzl6wi4v5i7rfs4rn0si0fd68d19i"; }; - buildInputs = [ autoconf automake libtool pkgconfig openconnect polkit - file openvpn vpnc glib dbus iptables gnutls - wpa_supplicant readline6 pptp ppp tree ]; + buildInputs = [ openconnect polkit + openvpn vpnc glib dbus iptables gnutls + wpa_supplicant readline6 pptp ppp ]; + + nativeBuildInputs = [ pkgconfig file ]; preConfigure = '' export WPASUPPLICANT=${wpa_supplicant}/sbin/wpa_supplicant - ./bootstrap + export PPPD=${ppp}/sbin/pppd sed -i "s/\/usr\/bin\/file/file/g" ./configure - substituteInPlace configure --replace /usr/sbin/pptp ${pptp}/sbin/pptp - substituteInPlace configure --replace /usr/sbin/pppd ${ppp}/sbin/pppd ''; configureFlags = [ @@ -43,6 +42,7 @@ stdenv.mkDerivation rec { "--enable-tools" "--enable-datafiles" "--enable-pptp" + "--with-pptp=${pptp}/sbin/pptp" ]; postInstall = '' |