git.iko.soy/typeable/nixpkgs
on master help sign in
hostapd: fix hostapd noscan patch url. (#63802)
cdb032dFlorian Klink
pkgs/os-specific/linux/hostapd/default.nix+10−9
@@ -1,11 +1,6 @@
1{ stdenv, fetchurl, pkgconfig, libnl, openssl, sqlite ? null }:
1{ stdenv, fetchurl, pkgconfig, libnl, openssl, sqlite ? null }:
2
2
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 {
9 name = "hostapd-${version}";
4 name = "hostapd-${version}";
10 version = "2.8";
5 version = "2.8";
11
6
@@ -17,7 +12,13 @@ in stdenv.mkDerivation rec {
17 nativeBuildInputs = [ pkgconfig ];
12 nativeBuildInputs = [ pkgconfig ];
18 buildInputs = [ libnl openssl sqlite ];
13 buildInputs = [ libnl openssl sqlite ];
19
14
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+ ];
21
22
22 outputs = [ "out" "man" ];
23 outputs = [ "out" "man" ];
23
24
@@ -48,7 +49,7 @@ in stdenv.mkDerivation rec {
48 CONFIG_INTERNETWORKING=y
49 CONFIG_INTERNETWORKING=y
49 CONFIG_HS20=y
50 CONFIG_HS20=y
50 CONFIG_ACS=y
51 CONFIG_ACS=y
51− '' + optionalString (sqlite != null) ''
52+ '' + stdenv.lib.optionalString (sqlite != null) ''
52 CONFIG_SQLITE=y
53 CONFIG_SQLITE=y
53 '';
54 '';
54
55
@@ -67,7 +68,7 @@ in stdenv.mkDerivation rec {
67 install -vD hostapd_cli.1 -t $man/share/man/man1
68 install -vD hostapd_cli.1 -t $man/share/man/man1
68 '';
69 '';
69
70
70− meta = {
71+ meta = with stdenv.lib; {
71 homepage = http://hostap.epitest.fi;
72 homepage = http://hostap.epitest.fi;
72 repositories.git = git://w1.fi/hostap.git;
73 repositories.git = git://w1.fi/hostap.git;
73 description = "A user space daemon for access point and authentication servers";
74 description = "A user space daemon for access point and authentication servers";