treewide: clear out remaining qt5 conditionals

1 files changed, 2 insertions, 9 deletions

diff --git a/pkgs/development/libraries/appstream/qt.nix b/pkgs/development/libraries/appstream/qt.nix
index 3704332119e..bcc24376ff3 100644
--- a/pkgs/development/libraries/appstream/qt.nix
+++ b/pkgs/development/libraries/appstream/qt.nix
@@ -1,4 +1,4 @@
-{ lib, mkDerivation, appstream, qtbase, qttools, nixosTests }:
+{ mkDerivation, appstream, qtbase, qttools, nixosTests }:
 
 # TODO: look into using the libraries from the regular appstream derivation as we keep duplicates here
 
@@ -14,14 +14,7 @@ mkDerivation {
 
   mesonFlags = appstream.mesonFlags ++ [ "-Dqt=true" ];
 
-  patches = (appstream.patches or []) ++ lib.optionals (lib.versionOlder qtbase.version "5.14") [
-    # Fix darwin build for libsForQt5.appstream-qt
-    # Old Qt moc doesn't know about fancy C++14 features
-    # ../qt/component.h:93: Parse error at "UrlTranslate"
-    # Remove both this patch and related comment in default.nix
-    # once Qt 5.14 or later becomes default on darwin
-    ./fix-build-for-qt-olderthan-514.patch
-  ];
+  patches = appstream.patches;
 
   postFixup = ''
     sed -i "$dev/lib/cmake/AppStreamQt/AppStreamQtConfig.cmake" \