b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

avahi: remove Qt 4 support

Browse source 
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
This commit is contained in:
Jan Tojnar 2022-06-10 02:51:47 +02:00 committed by GitHub
parent 8fa4e66def
commit eb31cd04f1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/development/libraries/avahi/default.nix
View file

@ -14,8 +14,6 @@
, nixosTests , nixosTests
, gtk3Support ? false , gtk3Support ? false
, gtk3 ? null , gtk3 ? null
, qt4 ? null
, qt4Support ? false
, qt5 ? null , qt5 ? null
, qt5Support ? false , qt5Support ? false
, withLibdnssdCompat ? false , withLibdnssdCompat ? false
@ -23,8 +21,6 @@
, withPython ? false , withPython ? false
}: }:
assert qt4Support -> qt4 != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "avahi${lib.optionalString withLibdnssdCompat "-compat"}"; pname = "avahi${lib.optionalString withLibdnssdCompat "-compat"}";
version = "0.8"; version = "0.8";
@ -63,8 +59,6 @@ stdenv.mkDerivation rec {
XMLParser XMLParser
]) ++ lib.optionals gtk3Support [ ]) ++ lib.optionals gtk3Support [
gtk3 gtk3
] ++ lib.optionals qt4Support [
qt4
] ++ lib.optionals qt5Support [ ] ++ lib.optionals qt5Support [
qt5 qt5
]; ];
@ -81,7 +75,6 @@ stdenv.mkDerivation rec {
# Use non-deprecated path https://github.com/lathiat/avahi/pull/376 # Use non-deprecated path https://github.com/lathiat/avahi/pull/376
"--with-dbus-sys=${placeholder "out"}/share/dbus-1/system.d" "--with-dbus-sys=${placeholder "out"}/share/dbus-1/system.d"
(lib.enableFeature gtk3Support "gtk3") (lib.enableFeature gtk3Support "gtk3")
(lib.enableFeature qt4Support "qt4")
(lib.enableFeature qt5Support "qt5") (lib.enableFeature qt5Support "qt5")
(lib.enableFeature withPython "python") (lib.enableFeature withPython "python")
"--localstatedir=/var" "--localstatedir=/var"