From eb31cd04f1ac7aaa7d0f95cad42d36e148ebec23 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 10 Jun 2022 02:51:47 +0200 Subject: [PATCH] avahi: remove Qt 4 support Co-authored-by: Sandro --- pkgs/development/libraries/avahi/default.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix index 7ab9220be71..e2421743455 100644 --- a/pkgs/development/libraries/avahi/default.nix +++ b/pkgs/development/libraries/avahi/default.nix @@ -14,8 +14,6 @@ , nixosTests , gtk3Support ? false , gtk3 ? null -, qt4 ? null -, qt4Support ? false , qt5 ? null , qt5Support ? false , withLibdnssdCompat ? false @@ -23,8 +21,6 @@ , withPython ? false }: -assert qt4Support -> qt4 != null; - stdenv.mkDerivation rec { pname = "avahi${lib.optionalString withLibdnssdCompat "-compat"}"; version = "0.8"; @@ -63,8 +59,6 @@ stdenv.mkDerivation rec { XMLParser ]) ++ lib.optionals gtk3Support [ gtk3 - ] ++ lib.optionals qt4Support [ - qt4 ] ++ lib.optionals qt5Support [ qt5 ]; @@ -81,7 +75,6 @@ stdenv.mkDerivation rec { # Use non-deprecated path https://github.com/lathiat/avahi/pull/376 "--with-dbus-sys=${placeholder "out"}/share/dbus-1/system.d" (lib.enableFeature gtk3Support "gtk3") - (lib.enableFeature qt4Support "qt4") (lib.enableFeature qt5Support "qt5") (lib.enableFeature withPython "python") "--localstatedir=/var"