diff --git a/pkgs/development/libraries/kde-frameworks/attica.nix b/pkgs/development/libraries/kde-frameworks/attica.nix index 4cb2e8e958a..d350e09f59d 100644 --- a/pkgs/development/libraries/kde-frameworks/attica.nix +++ b/pkgs/development/libraries/kde-frameworks/attica.nix @@ -4,7 +4,6 @@ mkDerivation { name = "attica"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/bluez-qt.nix b/pkgs/development/libraries/kde-frameworks/bluez-qt.nix index 9717e770ed5..78f4e2e6320 100644 --- a/pkgs/development/libraries/kde-frameworks/bluez-qt.nix +++ b/pkgs/development/libraries/kde-frameworks/bluez-qt.nix @@ -7,7 +7,6 @@ mkDerivation { name = "bluez-qt"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.7.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtdeclarative ]; diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index 02e25692ef1..200cbad9d78 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -28,6 +28,8 @@ existing packages here and modify it as necessary. let + minQtVersion = "5.14"; + srcs = import ./srcs.nix { inherit fetchurl; mirror = "mirror://kde"; @@ -79,6 +81,7 @@ let ]; maintainers = with lib.maintainers; [ ttuegel nyanloutre ]; platforms = lib.platforms.linux; + broken = lib.versionOlder libsForQt5.qtbase.version minQtVersion; } // (args.meta or {}); in mkDerivation (args // { diff --git a/pkgs/development/libraries/kde-frameworks/karchive.nix b/pkgs/development/libraries/kde-frameworks/karchive.nix index 7a9ea86bbb5..0302e4e3009 100644 --- a/pkgs/development/libraries/kde-frameworks/karchive.nix +++ b/pkgs/development/libraries/kde-frameworks/karchive.nix @@ -8,7 +8,6 @@ mkDerivation { name = "karchive"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ bzip2 xz zlib ]; diff --git a/pkgs/development/libraries/kde-frameworks/kcalendarcore.nix b/pkgs/development/libraries/kde-frameworks/kcalendarcore.nix index e0b6c5313bb..ae3c304cea3 100644 --- a/pkgs/development/libraries/kde-frameworks/kcalendarcore.nix +++ b/pkgs/development/libraries/kde-frameworks/kcalendarcore.nix @@ -2,7 +2,8 @@ mkDerivation, lib, extra-cmake-modules, - libical + libical, + qtbase }: mkDerivation { diff --git a/pkgs/development/libraries/kde-frameworks/kcodecs.nix b/pkgs/development/libraries/kde-frameworks/kcodecs.nix index 357c0e1d11c..aa5183410a9 100644 --- a/pkgs/development/libraries/kde-frameworks/kcodecs.nix +++ b/pkgs/development/libraries/kde-frameworks/kcodecs.nix @@ -4,7 +4,6 @@ mkDerivation { name = "kcodecs"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qttools gperf ]; diff --git a/pkgs/development/libraries/kde-frameworks/kconfig.nix b/pkgs/development/libraries/kde-frameworks/kconfig.nix index 94f4cb04807..5e061af432a 100644 --- a/pkgs/development/libraries/kde-frameworks/kconfig.nix +++ b/pkgs/development/libraries/kde-frameworks/kconfig.nix @@ -4,7 +4,6 @@ mkDerivation { name = "kconfig"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qttools ]; diff --git a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix index 6f2e3f92387..5c6adb86e75 100644 --- a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix @@ -8,7 +8,6 @@ mkDerivation { name = "kcoreaddons"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qttools shared-mime-info ]; diff --git a/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix b/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix index b497ebe1c80..eb3ce1c1a43 100644 --- a/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix @@ -8,7 +8,6 @@ mkDerivation { name = "kdbusaddons"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qttools qtx11extras ]; diff --git a/pkgs/development/libraries/kde-frameworks/kdnssd.nix b/pkgs/development/libraries/kde-frameworks/kdnssd.nix index b4dabba624a..8c7008beb62 100644 --- a/pkgs/development/libraries/kde-frameworks/kdnssd.nix +++ b/pkgs/development/libraries/kde-frameworks/kdnssd.nix @@ -8,7 +8,6 @@ mkDerivation { name = "kdnssd"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ avahi qttools ]; diff --git a/pkgs/development/libraries/kde-frameworks/kguiaddons.nix b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix index 6c7365fd27e..95ce416521f 100644 --- a/pkgs/development/libraries/kde-frameworks/kguiaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix @@ -14,6 +14,5 @@ mkDerivation { meta = with lib; { maintainers = [ maintainers.ttuegel ]; - broken = versionOlder qtbase.version "5.14.0"; }; } diff --git a/pkgs/development/libraries/kde-frameworks/ki18n.nix b/pkgs/development/libraries/kde-frameworks/ki18n.nix index 0733abc8692..633fad9c00a 100644 --- a/pkgs/development/libraries/kde-frameworks/ki18n.nix +++ b/pkgs/development/libraries/kde-frameworks/ki18n.nix @@ -8,7 +8,6 @@ mkDerivation { name = "ki18n"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; propagatedNativeBuildInputs = [ gettext python3 ]; diff --git a/pkgs/development/libraries/kde-frameworks/kidletime.nix b/pkgs/development/libraries/kde-frameworks/kidletime.nix index 883ef2862e4..8cedccb6f07 100644 --- a/pkgs/development/libraries/kde-frameworks/kidletime.nix +++ b/pkgs/development/libraries/kde-frameworks/kidletime.nix @@ -8,7 +8,6 @@ mkDerivation { name = "kidletime"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtx11extras ]; diff --git a/pkgs/development/libraries/kde-frameworks/kirigami2.nix b/pkgs/development/libraries/kde-frameworks/kirigami2.nix index 60cef704865..bb5a5a3fc80 100644 --- a/pkgs/development/libraries/kde-frameworks/kirigami2.nix +++ b/pkgs/development/libraries/kde-frameworks/kirigami2.nix @@ -2,9 +2,6 @@ mkDerivation { name = "kirigami2"; - meta = { - broken = builtins.compareVersions qtbase.version "5.14.0" < 0; - }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtbase qtquickcontrols2 qttranslations qtgraphicaleffects ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/kde-frameworks/kitemmodels.nix b/pkgs/development/libraries/kde-frameworks/kitemmodels.nix index c3266a21c06..51195147a8d 100644 --- a/pkgs/development/libraries/kde-frameworks/kitemmodels.nix +++ b/pkgs/development/libraries/kde-frameworks/kitemmodels.nix @@ -8,7 +8,6 @@ mkDerivation { name = "kitemmodels"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/kitemviews.nix b/pkgs/development/libraries/kde-frameworks/kitemviews.nix index eeed5c703a2..ee317d853d0 100644 --- a/pkgs/development/libraries/kde-frameworks/kitemviews.nix +++ b/pkgs/development/libraries/kde-frameworks/kitemviews.nix @@ -8,7 +8,6 @@ mkDerivation { name = "kitemviews"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qttools ]; diff --git a/pkgs/development/libraries/kde-frameworks/kplotting.nix b/pkgs/development/libraries/kde-frameworks/kplotting.nix index f1c99e0c93b..c4c3067034b 100644 --- a/pkgs/development/libraries/kde-frameworks/kplotting.nix +++ b/pkgs/development/libraries/kde-frameworks/kplotting.nix @@ -6,7 +6,6 @@ mkDerivation { name = "kplotting"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ qtbase qttools ]; diff --git a/pkgs/development/libraries/kde-frameworks/kquickcharts.nix b/pkgs/development/libraries/kde-frameworks/kquickcharts.nix index 5a06d4c1cad..287268d2fff 100644 --- a/pkgs/development/libraries/kde-frameworks/kquickcharts.nix +++ b/pkgs/development/libraries/kde-frameworks/kquickcharts.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, - qtquickcontrols2, + qtquickcontrols2, qtbase, }: mkDerivation { diff --git a/pkgs/development/libraries/kde-frameworks/kwayland.nix b/pkgs/development/libraries/kde-frameworks/kwayland.nix index 5b73cc7fcea..6ba8c7e5036 100644 --- a/pkgs/development/libraries/kde-frameworks/kwayland.nix +++ b/pkgs/development/libraries/kde-frameworks/kwayland.nix @@ -8,7 +8,6 @@ mkDerivation { name = "kwayland"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ plasma-wayland-protocols wayland wayland-protocols ]; diff --git a/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix b/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix index 821c703a589..217be756867 100644 --- a/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix @@ -8,7 +8,6 @@ mkDerivation { name = "kwidgetsaddons"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qttools ]; diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix index c418ca39433..b91c3f25d49 100644 --- a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix @@ -9,7 +9,6 @@ mkDerivation { name = "kwindowsystem"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = lib.versionOlder qtbase.version "5.14.0"; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ libpthreadstubs libXdmcp qttools qtx11extras ]; diff --git a/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix b/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix index 195e90feef6..774f4431103 100644 --- a/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix +++ b/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix @@ -8,7 +8,6 @@ mkDerivation { name = "modemmanager-qt"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.7.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ modemmanager qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix b/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix index 4ded321674f..1550d36e3e9 100644 --- a/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix +++ b/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix @@ -8,7 +8,6 @@ mkDerivation { name = "networkmanager-qt"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.7.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ networkmanager qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/prison.nix b/pkgs/development/libraries/kde-frameworks/prison.nix index cf74ee20c2d..1a94cd1a1df 100644 --- a/pkgs/development/libraries/kde-frameworks/prison.nix +++ b/pkgs/development/libraries/kde-frameworks/prison.nix @@ -8,7 +8,6 @@ mkDerivation { name = "prison"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.7.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ libdmtx qrencode ]; diff --git a/pkgs/development/libraries/kde-frameworks/solid.nix b/pkgs/development/libraries/kde-frameworks/solid.nix index f769f76854a..846def17922 100644 --- a/pkgs/development/libraries/kde-frameworks/solid.nix +++ b/pkgs/development/libraries/kde-frameworks/solid.nix @@ -8,7 +8,6 @@ mkDerivation { name = "solid"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ bison extra-cmake-modules flex media-player-info ]; buildInputs = [ qtdeclarative qttools ]; diff --git a/pkgs/development/libraries/kde-frameworks/sonnet.nix b/pkgs/development/libraries/kde-frameworks/sonnet.nix index 431e4b81058..e7167b10878 100644 --- a/pkgs/development/libraries/kde-frameworks/sonnet.nix +++ b/pkgs/development/libraries/kde-frameworks/sonnet.nix @@ -7,7 +7,6 @@ mkDerivation { name = "sonnet"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ aspell qttools ]; diff --git a/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix b/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix index 4b3f8440c56..b61250df11b 100644 --- a/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix +++ b/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix @@ -6,7 +6,6 @@ mkDerivation { name = "syntax-highlighting"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules perl ]; buildInputs = [ qttools ]; diff --git a/pkgs/development/libraries/kde-frameworks/threadweaver.nix b/pkgs/development/libraries/kde-frameworks/threadweaver.nix index 70e948afda9..83a93acd852 100644 --- a/pkgs/development/libraries/kde-frameworks/threadweaver.nix +++ b/pkgs/development/libraries/kde-frameworks/threadweaver.nix @@ -8,7 +8,6 @@ mkDerivation { name = "threadweaver"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ qtbase ];