summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2013-06-20 19:08:09 +0200
committerVladimír Čunát <vcunat@gmail.com>2013-06-20 19:13:29 +0200
commit2cfbe7b292f17ec03ccbdb359dbf21ec73f2de0e (patch)
tree7f29c9cc9fd25bdebabad8ba4d487298d636d0e5 /pkgs
parent3b67955fcfbaf7b5fdf187c6edf41a550cd0609d (diff)
downloadnixpkgs-2cfbe7b292f17ec03ccbdb359dbf21ec73f2de0e.tar
nixpkgs-2cfbe7b292f17ec03ccbdb359dbf21ec73f2de0e.tar.gz
nixpkgs-2cfbe7b292f17ec03ccbdb359dbf21ec73f2de0e.tar.bz2
nixpkgs-2cfbe7b292f17ec03ccbdb359dbf21ec73f2de0e.tar.lz
nixpkgs-2cfbe7b292f17ec03ccbdb359dbf21ec73f2de0e.tar.xz
nixpkgs-2cfbe7b292f17ec03ccbdb359dbf21ec73f2de0e.tar.zst
nixpkgs-2cfbe7b292f17ec03ccbdb359dbf21ec73f2de0e.zip
wpa_supplicant: update 1.1 -> 2.0
It works fine for me, GUI as well.
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/os-specific/linux/wpa_supplicant/default.nix4
-rw-r--r--pkgs/os-specific/linux/wpa_supplicant/libnl.patch2
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix
index 8f441303c25..ec2c704cfb5 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 = "1.1";
+  version = "2.0";
 
   name = "wpa_supplicant-${version}";
 
   src = fetchurl {
     url = "http://hostap.epitest.fi/releases/${name}.tar.gz";
-    sha256 = "00lyifj8cz7qyal6dy1dxbpk3g3bywvdarik8gbj9ds7zmfbwkd5";
+    sha256 = "02cy6wrs4nzm7wbq9mc1vby8lnj58k4sb10h718ks8mmzc4mc49c";
   };
 
   extraConfig =
diff --git a/pkgs/os-specific/linux/wpa_supplicant/libnl.patch b/pkgs/os-specific/linux/wpa_supplicant/libnl.patch
index ede6dad721c..477f8dd55f6 100644
--- a/pkgs/os-specific/linux/wpa_supplicant/libnl.patch
+++ b/pkgs/os-specific/linux/wpa_supplicant/libnl.patch
@@ -5,7 +5,7 @@ diff -up wpa_supplicant-1.0-rc2/src/drivers/drivers.mak.foo wpa_supplicant-1.0-r
  ifdef CONFIG_LIBNL32
    DRV_LIBS += -lnl-3
    DRV_LIBS += -lnl-genl-3
--  DRV_CFLAGS += -DCONFIG_LIBNL20
+-  DRV_CFLAGS += -DCONFIG_LIBNL20 -I/usr/include/libnl3
 +  DRV_CFLAGS += -DCONFIG_LIBNL20 `pkg-config --cflags libnl-3.0`
  else
    ifdef CONFIG_LIBNL_TINY