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)

+13 -13
+13 -13
pkgs/tools/networking/connman/default.nix
··· 1 - { stdenv, fetchgit, autoconf, automake, libtool, pkgconfig, openconnect, file, 1 + { stdenv, fetchurl, pkgconfig, openconnect, file, 2 2 openvpn, vpnc, glib, dbus, iptables, gnutls, polkit, 3 - wpa_supplicant, readline6, pptp, ppp, tree }: 3 + wpa_supplicant, readline6, pptp, ppp }: 4 4 5 5 stdenv.mkDerivation rec { 6 6 name = "connman-${version}"; 7 - version = "1.31"; 8 - src = fetchgit { 9 - url = "git://git.kernel.org/pub/scm/network/connman/connman.git"; 10 - rev = "refs/tags/${version}"; 11 - sha256 = "90dab6b11841cb4b6400711d234b59fb4fad4e8778bed6e7ad3ac7ac135d6893"; 7 + version = "1.32"; 8 + src = fetchurl { 9 + url = "mirror://kernel/linux/network/connman/${name}.tar.xz"; 10 + sha256 = "0k4kw2j78gwxf0rq79a099qkzl6wi4v5i7rfs4rn0si0fd68d19i"; 12 11 }; 13 12 14 - buildInputs = [ autoconf automake libtool pkgconfig openconnect polkit 15 - file openvpn vpnc glib dbus iptables gnutls 16 - wpa_supplicant readline6 pptp ppp tree ]; 13 + buildInputs = [ openconnect polkit 14 + openvpn vpnc glib dbus iptables gnutls 15 + wpa_supplicant readline6 pptp ppp ]; 16 + 17 + nativeBuildInputs = [ pkgconfig file ]; 17 18 18 19 preConfigure = '' 19 20 export WPASUPPLICANT=${wpa_supplicant}/sbin/wpa_supplicant 20 - ./bootstrap 21 + export PPPD=${ppp}/sbin/pppd 21 22 sed -i "s/\/usr\/bin\/file/file/g" ./configure 22 - substituteInPlace configure --replace /usr/sbin/pptp ${pptp}/sbin/pptp 23 - substituteInPlace configure --replace /usr/sbin/pppd ${ppp}/sbin/pppd 24 23 ''; 25 24 26 25 configureFlags = [ ··· 43 42 "--enable-tools" 44 43 "--enable-datafiles" 45 44 "--enable-pptp" 45 + "--with-pptp=${pptp}/sbin/pptp" 46 46 ]; 47 47 48 48 postInstall = ''