Merge #155912: wpa_supplicant_gui: fix build after update

2022-01-20 22:44:36 +01:00
parent e4c4ae8e1f 9e07c1de65
commit b02c25a393
2 changed files with 3 additions and 13 deletions
@@ -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; {
@@ -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 ];