From 219382bf283274e0ad248e7dd1c21780e58b52cd Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 17 May 2020 08:40:30 +0200 Subject: [PATCH] wpa_supplicant_gui: fix build with Inkscape 1.0 --- pkgs/os-specific/linux/wpa_supplicant/gui.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/wpa_supplicant/gui.nix b/pkgs/os-specific/linux/wpa_supplicant/gui.nix index d60ff7f364c..911b0331f4c 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/gui.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/gui.nix @@ -1,14 +1,23 @@ -{ stdenv, mkDerivation, qtbase, qmake, inkscape, imagemagick, wpa_supplicant }: +{ stdenv, mkDerivation, fetchpatch, qtbase, qmake, inkscape, imagemagick, wpa_supplicant }: mkDerivation { name = "wpa_gui-${wpa_supplicant.version}"; inherit (wpa_supplicant) src; + patches = [ + # Fix build with Inkscape 1.0 + # https://github.com/NixOS/nixpkgs/issues/86930 + (fetchpatch { + url = "https://w1.fi/cgit/hostap/patch/?id=0388992905a5c2be5cba9497504eaea346474754"; + sha256 = "YDSY7l/qEco+aZYcYHLf/rxCKvPw35ibGoMorjA5GhY="; + }) + ]; + buildInputs = [ qtbase ]; nativeBuildInputs = [ qmake inkscape imagemagick ]; - prePatch = '' + postPatch = '' cd wpa_supplicant/wpa_gui-qt4 '';