ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-15 13:37:21 +03:00
Code Issues Projects Releases Wiki Activity

connman: 1.31 -> 1.32

Browse Source 
fetch release tarball instead of git checkout and drop autotools

This update is compatible with iptables 1.6.0 (see #12178)
This commit is contained in:
Alexander Ried 2016-05-03 20:03:14 +02:00
parent 6d55b2e9c0
commit b95eebec65
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 = ''