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

Update wpa_supplicant

Browse Source
This commit is contained in:
Michael Raskin 2014-10-12 12:34:05 +04:00
parent 1602f9b90a
commit 299abee9ab
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,13 +5,13 @@
assert readlineSupport -> readline != null; assert readlineSupport -> readline != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.2"; version = "2.3";
name = "wpa_supplicant-${version}"; name = "wpa_supplicant-${version}";
src = fetchurl { src = fetchurl {
url = "http://hostap.epitest.fi/releases/${name}.tar.gz"; url = "http://hostap.epitest.fi/releases/${name}.tar.gz";
sha256 = "1vf8jc4yyksbxf86narvsli3vxfbm8nbnim2mdp66nd6d3yvin70"; sha256 = "0skvkl6c10ls4s48b2wmf47h9j1y40nlzxnzn8hyaw2j0prmpapa";
}; };
extraConfig = extraConfig =
@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
echo "$extraConfig" >> .config echo "$extraConfig" >> .config
cat .config cat .config
substituteInPlace Makefile --replace /usr/local $out substituteInPlace Makefile --replace /usr/local $out
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo "${libnl}"/include/libnl*/)"
''; '';
buildInputs = [ openssl dbus_libs libnl ] buildInputs = [ openssl dbus_libs libnl ]
@ -38,7 +39,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
patches = [ ./libnl.patch ]; patches = [];
postInstall = '' postInstall = ''
mkdir -p $out/share/man/man5 $out/share/man/man8 mkdir -p $out/share/man/man5 $out/share/man/man8

13
pkgs/os-specific/linux/wpa_supplicant/libnl.patch
View File

@ -1,13 +0,0 @@
diff -up wpa_supplicant-1.0-rc2/src/drivers/drivers.mak.foo wpa_supplicant-1.0-rc2/src/drivers/drivers.mak
--- wpa_supplicant-1.0-rc2/src/drivers/drivers.mak.foo 2012-03-02 16:11:43.176448714 -0600
+++ wpa_supplicant-1.0-rc2/src/drivers/drivers.mak 2012-03-02 16:12:29.759866341 -0600
@@ -48,7 +48,7 @@ NEED_RFKILL=y
ifdef CONFIG_LIBNL32
DRV_LIBS += -lnl-3
DRV_LIBS += -lnl-genl-3
- DRV_CFLAGS += -DCONFIG_LIBNL20 -I/usr/include/libnl3
+ DRV_CFLAGS += -DCONFIG_LIBNL20 `pkg-config --cflags libnl-3.0`
else
ifdef CONFIG_LIBNL_TINY
DRV_LIBS += -lnl-tiny