diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2014-10-12 12:34:05 +0400 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2014-10-12 12:34:16 +0400 |
| commit | 299abee9ab2086eb630dd262eae32338eeb6b02d (patch) | |
| tree | d48b13213a948a0ea6f11b273e7a6a6fe226ad5b /pkgs/os-specific/linux/wpa_supplicant | |
| parent | 1602f9b90ac281ae847239c56aa2f82c08aafba2 (diff) | |
| download | nixpkgs-299abee9ab2086eb630dd262eae32338eeb6b02d.tar nixpkgs-299abee9ab2086eb630dd262eae32338eeb6b02d.tar.gz nixpkgs-299abee9ab2086eb630dd262eae32338eeb6b02d.tar.bz2 nixpkgs-299abee9ab2086eb630dd262eae32338eeb6b02d.tar.lz nixpkgs-299abee9ab2086eb630dd262eae32338eeb6b02d.tar.xz nixpkgs-299abee9ab2086eb630dd262eae32338eeb6b02d.tar.zst nixpkgs-299abee9ab2086eb630dd262eae32338eeb6b02d.zip | |
Update wpa_supplicant
Diffstat (limited to 'pkgs/os-specific/linux/wpa_supplicant')
| -rw-r--r-- | pkgs/os-specific/linux/wpa_supplicant/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/wpa_supplicant/libnl.patch | 13 |
2 files changed, 4 insertions, 16 deletions
diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 937f65089e9..988242e3c42 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -5,13 +5,13 @@ assert readlineSupport -> readline != null; stdenv.mkDerivation rec { - version = "2.2"; + version = "2.3"; name = "wpa_supplicant-${version}"; src = fetchurl { url = "http://hostap.epitest.fi/releases/${name}.tar.gz"; - sha256 = "1vf8jc4yyksbxf86narvsli3vxfbm8nbnim2mdp66nd6d3yvin70"; + sha256 = "0skvkl6c10ls4s48b2wmf47h9j1y40nlzxnzn8hyaw2j0prmpapa"; }; extraConfig = @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { echo "$extraConfig" >> .config cat .config substituteInPlace Makefile --replace /usr/local $out + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo "${libnl}"/include/libnl*/)" ''; buildInputs = [ openssl dbus_libs libnl ] @@ -38,7 +39,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - patches = [ ./libnl.patch ]; + patches = []; postInstall = '' mkdir -p $out/share/man/man5 $out/share/man/man8 diff --git a/pkgs/os-specific/linux/wpa_supplicant/libnl.patch b/pkgs/os-specific/linux/wpa_supplicant/libnl.patch deleted file mode 100644 index 477f8dd55f6..00000000000 --- a/pkgs/os-specific/linux/wpa_supplicant/libnl.patch +++ /dev/null @@ -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 - |