diff options
author | Vladimír Čunát <v@cunat.cz> | 2022-01-20 18:12:47 +0100 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2022-01-20 18:12:47 +0100 |
commit | 9e07c1de6562103313920a45b8a1f6e4ebbe647f (patch) | |
tree | 83cea68c15b3ddae67b255d37f95ece24b97bf5b /pkgs/os-specific/linux/wpa_supplicant | |
parent | b4797eaffc45f360849067549c709295f0c0c1d2 (diff) |
wpa_supplicant_gui: fixup build after update in PR #155266
Diffstat (limited to 'pkgs/os-specific/linux/wpa_supplicant')
-rw-r--r-- | pkgs/os-specific/linux/wpa_supplicant/default.nix | 3 | ||||
-rw-r--r-- | pkgs/os-specific/linux/wpa_supplicant/gui.nix | 13 |
2 files changed, 3 insertions, 13 deletions
diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index e48dce4f3136d..380fca42975a4 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, openssl, pkg-config, libnl -, nixosTests +, nixosTests, wpa_supplicant_gui , withDbus ? true, dbus , withReadline ? true, readline , withPcsclite ? true, pcsclite @@ -113,6 +113,7 @@ stdenv.mkDerivation rec { passthru.tests = { inherit (nixosTests) wpa_supplicant; + inherit wpa_supplicant_gui; # inherits the src+version updates }; meta = with lib; { diff --git a/pkgs/os-specific/linux/wpa_supplicant/gui.nix b/pkgs/os-specific/linux/wpa_supplicant/gui.nix index 8ec7519bf1ad1..82e104cac3aad 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/gui.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/gui.nix @@ -2,18 +2,7 @@ mkDerivation { pname = "wpa_gui"; - version = 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 = "05hs74qawa433adripzhycm45g7yvxr6074nd4zcl4gabzp9hd30"; - }) - ]; + inherit (wpa_supplicant) version src; buildInputs = [ qtbase ]; nativeBuildInputs = [ qmake inkscape imagemagick ]; |