@@ -1,11 +1,6 @@
11{ stdenv, fetchurl, pkgconfig, libnl, openssl, sqlite ? null }:
22
3−with stdenv.lib;
4−let noScanPatch = fetchurl {
5− url="https://git.telliq.com/gtu/openwrt/raw/master/package/network/services/hostapd/patches/300-noscan.patch";
6− sha256 = "04wg4yjc19wmwk6gia067z99gzzk9jacnwxh5wyia7k5wg71yj5k";
7− };
8−in stdenv.mkDerivation rec {
3+stdenv.mkDerivation rec {
94 name = "hostapd-${version}";
105 version = "2.8";
116
@@ -17,7 +12,13 @@ in stdenv.mkDerivation rec {
1712 nativeBuildInputs = [ pkgconfig ];
1813 buildInputs = [ libnl openssl sqlite ];
1914
20− patches = [ noScanPatch ];
15+ patches = [
16+ (fetchurl {
17+ # Note: fetchurl seems to be unhappy with openwrt git
18+ # server's URLs containing semicolons. Using the github mirror instead.
19+ url = "https://raw.githubusercontent.com/openwrt/openwrt/master/package/network/services/hostapd/patches/300-noscan.patch";
20+ sha256 = "04wg4yjc19wmwk6gia067z99gzzk9jacnwxh5wyia7k5wg71yj5k";})
21+ ];
2122
2223 outputs = [ "out" "man" ];
2324
@@ -48,7 +49,7 @@ in stdenv.mkDerivation rec {
4849 CONFIG_INTERNETWORKING=y
4950 CONFIG_HS20=y
5051 CONFIG_ACS=y
51− '' + optionalString (sqlite != null) ''
52+ '' + stdenv.lib.optionalString (sqlite != null) ''
5253 CONFIG_SQLITE=y
5354 '';
5455
@@ -67,7 +68,7 @@ in stdenv.mkDerivation rec {
6768 install -vD hostapd_cli.1 -t $man/share/man/man1
6869 '';
6970
70− meta = {
71+ meta = with stdenv.lib; {
7172 homepage = http://hostap.epitest.fi;
7273 repositories.git = git://w1.fi/hostap.git;
7374 description = "A user space daemon for access point and authentication servers";