summary refs log tree commit diff
path: root/pkgs/os-specific/linux/hostapd
diff options
context:
space:
mode:
authorMathijs Kwik <mathijs@bluescreen303.nl>2012-09-07 15:04:47 +0200
committerMathijs Kwik <mathijs@bluescreen303.nl>2012-09-09 13:04:14 +0200
commit3de1a56a73467206c87e36c808b0b8ac22dc48a3 (patch)
tree33d8ce59a68327ff429aa75cf5e6a8efc02d6d72 /pkgs/os-specific/linux/hostapd
parentc1c9c9d2a127c76e6bdb8dc0c488f05247aa06e5 (diff)
downloadnixpkgs-3de1a56a73467206c87e36c808b0b8ac22dc48a3.tar
nixpkgs-3de1a56a73467206c87e36c808b0b8ac22dc48a3.tar.gz
nixpkgs-3de1a56a73467206c87e36c808b0b8ac22dc48a3.tar.bz2
nixpkgs-3de1a56a73467206c87e36c808b0b8ac22dc48a3.tar.lz
nixpkgs-3de1a56a73467206c87e36c808b0b8ac22dc48a3.tar.xz
nixpkgs-3de1a56a73467206c87e36c808b0b8ac22dc48a3.tar.zst
nixpkgs-3de1a56a73467206c87e36c808b0b8ac22dc48a3.zip
hostapd: upgrade to 1.0
Diffstat (limited to 'pkgs/os-specific/linux/hostapd')
-rw-r--r--pkgs/os-specific/linux/hostapd/default.nix15
1 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix
index 39f92d99b7f..f13a1033f8b 100644
--- a/pkgs/os-specific/linux/hostapd/default.nix
+++ b/pkgs/os-specific/linux/hostapd/default.nix
@@ -1,21 +1,22 @@
-{ stdenv, fetchurl, libnl1, openssl }:
+{ stdenv, fetchurl, libnl, openssl, pkgconfig }:
 stdenv.mkDerivation rec {
 
   name = "hostapd-${version}";
-  version = "0.7.3";
+  version = "1.0";
 
   src = fetchurl {
-    url = http://w1.fi/releases/hostapd-0.7.3.tar.gz;
-    sha256 = "0rqmjs4k50qjp2d0k71lg5vsh34w07w985cxjqklq6kyyf0jgsri";
+    url = "http://w1.fi/releases/${name}.tar.gz";
+    sha256 = "1k6z2g0g324593a7ybd76bywvj0gnf9cybqaj2sq5ks6gv5rsbh0";
   };
 
-  buildInputs = [ libnl1 openssl ];
+  buildInputs = [ libnl openssl pkgconfig ];
 
   configurePhase = ''
     cd hostapd
-    substituteInPlace defconfig --replace "#CONFIG_DRIVER_NL80211" "CONFIG_DRIVER_NL80211"
-    substituteInPlace Makefile --replace "/usr/local/bin/" "$out/bin/"
+    substituteInPlace Makefile --replace "/usr/local/bin" "$out/bin"
     mv defconfig .config
+    echo CONFIG_LIBNL32=y | tee -a .config
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags libnl-3.0)"
   '';
   preInstall = "mkdir -p $out/bin";