b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

hostapd: fix hostapd noscan patch url. (#63802)

Browse source 
hostapd: fix hostapd noscan patch url.
This commit is contained in:
Florian Klink 2019-06-26 09:51:54 +02:00 committed by GitHub
parent acba016400 1e5a8f9dd7
commit cdb032dff2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
pkgs/os-specific/linux/hostapd/default.nix
View file

@ -1,11 +1,6 @@
{ stdenv, fetchurl, pkgconfig, libnl, openssl, sqlite ? null }: { stdenv, fetchurl, pkgconfig, libnl, openssl, sqlite ? null }:
with stdenv.lib; stdenv.mkDerivation rec {
let noScanPatch = fetchurl {
url="https://git.telliq.com/gtu/openwrt/raw/master/package/network/services/hostapd/patches/300-noscan.patch";
sha256 = "04wg4yjc19wmwk6gia067z99gzzk9jacnwxh5wyia7k5wg71yj5k";
};
in stdenv.mkDerivation rec {
name = "hostapd-${version}"; name = "hostapd-${version}";
version = "2.8"; version = "2.8";
@ -17,7 +12,13 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libnl openssl sqlite ]; buildInputs = [ libnl openssl sqlite ];
patches = [ noScanPatch ]; patches = [
(fetchurl {
# Note: fetchurl seems to be unhappy with openwrt git
# server's URLs containing semicolons. Using the github mirror instead.
url = "https://raw.githubusercontent.com/openwrt/openwrt/master/package/network/services/hostapd/patches/300-noscan.patch";
sha256 = "04wg4yjc19wmwk6gia067z99gzzk9jacnwxh5wyia7k5wg71yj5k";})
];
outputs = [ "out" "man" ]; outputs = [ "out" "man" ];
@ -48,7 +49,7 @@ in stdenv.mkDerivation rec {
CONFIG_INTERNETWORKING=y CONFIG_INTERNETWORKING=y
CONFIG_HS20=y CONFIG_HS20=y
CONFIG_ACS=y CONFIG_ACS=y
'' + optionalString (sqlite != null) '' '' + stdenv.lib.optionalString (sqlite != null) ''
CONFIG_SQLITE=y CONFIG_SQLITE=y
''; '';
@ -67,7 +68,7 @@ in stdenv.mkDerivation rec {
install -vD hostapd_cli.1 -t $man/share/man/man1 install -vD hostapd_cli.1 -t $man/share/man/man1
''; '';
meta = { meta = with stdenv.lib; {
homepage = http://hostap.epitest.fi; homepage = http://hostap.epitest.fi;
repositories.git = git://w1.fi/hostap.git; repositories.git = git://w1.fi/hostap.git;
description = "A user space daemon for access point and authentication servers"; description = "A user space daemon for access point and authentication servers";