From f3b94dee34e49d1393de0bfb030451cf90a5f776 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Baylac-Jacqu=C3=A9?= Date: Wed, 26 Jun 2019 08:16:44 +0200 Subject: [PATCH] hostapd: fix hostapd noscan patch url. Something somehow got wrong in #63699; some adjustments made after the review have been discarded :/ --- pkgs/os-specific/linux/hostapd/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix index 1ec98cb9c51..b2417ebeb47 100644 --- a/pkgs/os-specific/linux/hostapd/default.nix +++ b/pkgs/os-specific/linux/hostapd/default.nix @@ -1,11 +1,7 @@ { stdenv, fetchurl, pkgconfig, libnl, openssl, sqlite ? null }: with stdenv.lib; -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 { +stdenv.mkDerivation rec { name = "hostapd-${version}"; version = "2.8"; @@ -17,7 +13,13 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; 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" ];