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

wpa_supplicant: upgrade to 1.0

Browse Source
This commit is contained in:
Mathijs Kwik 2012-09-07 13:54:20 +02:00
parent 3ab9e5a38a
commit d9aac705bb
1 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pkgs/os-specific/linux/wpa_supplicant/default.nix
View File

@ -1,15 +1,15 @@
{ stdenv, fetchurl, openssl, dbus_libs, pkgconfig, libnl1 }: { stdenv, fetchurl, openssl, dbus_libs, pkgconfig, libnl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.7.3"; version = "1.0";
name = "wpa_supplicant-${version}"; name = "wpa_supplicant-${version}";
src = fetchurl { src = fetchurl {
url = "http://hostap.epitest.fi/releases/wpa_supplicant-${version}.tar.gz"; url = "http://hostap.epitest.fi/releases/${name}.tar.gz";
sha256 = "0hwlsn512q2ps8wxxjmkjfdg3vjqqb9mxnnwfv1wqijkm3551kfh"; sha256 = "171b9027rbzy64zaal4832ix9i3mm6ypwmynbpia5bss793ivm4i";
}; };
preBuild = '' preBuild = ''
cd wpa_supplicant cd wpa_supplicant
cp -v defconfig .config cp -v defconfig .config
@ -18,26 +18,19 @@ stdenv.mkDerivation rec {
echo CONFIG_CTRL_IFACE_DBUS_NEW=y | tee -a .config echo CONFIG_CTRL_IFACE_DBUS_NEW=y | tee -a .config
echo CONFIG_CTRL_IFACE_DBUS_INTRO=y | tee -a .config echo CONFIG_CTRL_IFACE_DBUS_INTRO=y | tee -a .config
echo CONFIG_DRIVER_NL80211=y | tee -a .config echo CONFIG_DRIVER_NL80211=y | tee -a .config
echo CONFIG_LIBNL32=y | tee -a .config
substituteInPlace Makefile --replace /usr/local $out substituteInPlace Makefile --replace /usr/local $out
''; '';
buildInputs = [ openssl dbus_libs libnl1 ]; buildInputs = [ openssl dbus_libs libnl ];
buildNativeInputs = [ pkgconfig ]; buildNativeInputs = [ pkgconfig ];
patches = patches =
[ # Upstream patch required for NetworkManager-0.9 [ (fetchurl {
(fetchurl { url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/hostap_allow-linking-with-libnl-3.2.patch?h=packages/wpa_supplicant";
url = "http://w1.fi/gitweb/gitweb.cgi?p=hostap-07.git;a=commitdiff_plain;h=b80b5639935d37b95d00f86b57f2844a9c775f57"; name = "hostap_allow-linking-with-libnl-3.2.patch";
name = "wpa_supplicant-nm-0.9.patch"; sha256 = "0iwvjq0apc6mv1r03k5pnyjgda3q47yx36c4lqvv8i8q1vn7kbf2";
sha256 = "1pqba0l4rfhba5qafvvbywi9x1qmphs944p704bh1flnx7cz6ya8";
})
# wpa_supplicant crashes when controlled through dbus (wicd/nm)
# see: https://bugzilla.redhat.com/show_bug.cgi?id=678625
(fetchurl {
url = "https://bugzilla.redhat.com/attachment.cgi?id=491018";
name = "dbus-assertion-fix.patch";
sha256 = "6206d79bcd800d56cae73e2a01a27ac2bee961512f77e5d62a59256a9919077a";
}) })
]; ];