1646bc36da
on some hardware, wpa_supplicant would crash when controlled via dbus (wicd/networkmanager), this patch fixes it. svn path=/nixpkgs/trunk/; revision=31651
94 lines
2.9 KiB
Nix
94 lines
2.9 KiB
Nix
{stdenv, fetchurl, openssl, qt4, inkscape, dbus_libs, pkgconfig, libnl1}:
|
|
|
|
let
|
|
version = "0.7.3";
|
|
src = fetchurl {
|
|
url = "http://hostap.epitest.fi/releases/wpa_supplicant-${version}.tar.gz";
|
|
sha256 = "0hwlsn512q2ps8wxxjmkjfdg3vjqqb9mxnnwfv1wqijkm3551kfh";
|
|
};
|
|
in
|
|
|
|
(stdenv.mkDerivation rec {
|
|
name = "wpa_supplicant-${version}";
|
|
inherit src;
|
|
|
|
preBuild = ''
|
|
cd wpa_supplicant
|
|
cp -v defconfig .config
|
|
echo CONFIG_DEBUG_SYSLOG=y | tee -a .config
|
|
echo CONFIG_CTRL_IFACE_DBUS=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_DRIVER_NL80211=y | tee -a .config
|
|
substituteInPlace Makefile --replace /usr/local $out
|
|
'';
|
|
|
|
buildInputs = [openssl dbus_libs libnl1];
|
|
|
|
buildNativeInputs = [ pkgconfig ];
|
|
|
|
# Upstream patch required for NetworkManager-0.9
|
|
patches = [ (fetchurl {
|
|
url = "http://w1.fi/gitweb/gitweb.cgi?p=hostap-07.git;a=commitdiff_plain;h=b80b5639935d37b95d00f86b57f2844a9c775f57";
|
|
name = "wpa_supplicant-nm-0.9.patch";
|
|
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";
|
|
})
|
|
];
|
|
|
|
postInstall = ''
|
|
ensureDir $out/share/man/man5 $out/share/man/man8
|
|
cp -v doc/docbook/*.5 $out/share/man/man5/
|
|
cp -v doc/docbook/*.8 $out/share/man/man8/
|
|
ensureDir $out/etc/dbus-1/system.d $out/share/dbus-1/system-services
|
|
cp -v dbus/*service $out/share/dbus-1/system-services
|
|
sed -e "s@/sbin/wpa_supplicant@$out&@" -i $out/share/dbus-1/system-services/*
|
|
cp -v dbus/dbus-wpa_supplicant.conf $out/etc/dbus-1/system.d
|
|
'';
|
|
|
|
meta = {
|
|
homepage = http://hostap.epitest.fi/wpa_supplicant/;
|
|
description = "A tool for connecting to WPA and WPA2-protected wireless networks";
|
|
maintainers = with stdenv.lib.maintainers; [marcweber urkud];
|
|
platforms = stdenv.lib.platforms.linux;
|
|
};
|
|
}) // {
|
|
gui = stdenv.mkDerivation {
|
|
name = "wpa_gui-${version}";
|
|
|
|
inherit src;
|
|
|
|
buildInputs = [ qt4 ];
|
|
|
|
buildNativeInputs = [ inkscape ];
|
|
|
|
prePatch = "cd wpa_supplicant/wpa_gui-qt4";
|
|
|
|
configurePhase = ''
|
|
lrelease wpa_gui.pro
|
|
qmake'';
|
|
|
|
# We do not install .xpm icons. First of all, I don't know where they should
|
|
# be install. Second, this allows us to drop imagemagick build-time dependency.
|
|
postBuild = ''
|
|
sed -e '/ICONS.*xpm/d' -i icons/Makefile
|
|
make -C icons
|
|
'';
|
|
|
|
installPhase = ''
|
|
mkdir -pv $out/bin
|
|
cp -v wpa_gui $out/bin
|
|
mkdir -pv $out/share/applications
|
|
cp -v wpa_gui.desktop $out/share/applications
|
|
mkdir -pv $out/share/icons
|
|
cp -av icons/hicolor $out/share/icons
|
|
'';
|
|
};
|
|
}
|