diff options
Diffstat (limited to 'nixpkgs/pkgs/desktops/plasma-5')
23 files changed, 16 insertions, 32 deletions
diff --git a/nixpkgs/pkgs/desktops/plasma-5/bluedevil.nix b/nixpkgs/pkgs/desktops/plasma-5/bluedevil.nix index 7500dda7e3f2..db1e46f6d4e8 100644 --- a/nixpkgs/pkgs/desktops/plasma-5/bluedevil.nix +++ b/nixpkgs/pkgs/desktops/plasma-5/bluedevil.nix @@ -13,5 +13,4 @@ mkDerivation { ki18n kio kwindowsystem plasma-framework kcoreaddons kdbusaddons kded kiconthemes knotifications kwidgetsaddons ]; - meta.broken = lib.versionOlder qtbase.version "5.15.0"; } diff --git a/nixpkgs/pkgs/desktops/plasma-5/default.nix b/nixpkgs/pkgs/desktops/plasma-5/default.nix index 98bf4b025f2d..ea2e199e9310 100644 --- a/nixpkgs/pkgs/desktops/plasma-5/default.nix +++ b/nixpkgs/pkgs/desktops/plasma-5/default.nix @@ -30,6 +30,13 @@ existing packages here and modify it as necessary. }: let + minQtVersion = "5.15"; + broken = lib.versionOlder libsForQt5.qtbase.version minQtVersion; + maintainers = with lib.maintainers; [ ttuegel nyanloutre ]; + license = with lib.licenses; [ + lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 + ]; + srcs = import ./srcs.nix { inherit fetchurl; mirror = "mirror://kde"; @@ -81,14 +88,15 @@ let defaultSetupHook = if hasBin && hasDev then propagateBin else null; setupHook = args.setupHook or defaultSetupHook; - meta = { - license = with lib.licenses; [ - lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 - ]; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ ttuegel nyanloutre ]; - homepage = "http://www.kde.org"; - } // (args.meta or {}); + meta = + let meta = args.meta or {}; in + meta // { + homepage = meta.homepage or "http://www.kde.org"; + license = meta.license or license; + maintainers = (meta.maintainers or []) ++ maintainers; + platforms = meta.platforms or lib.platforms.linux; + broken = meta.broken or broken; + }; in mkDerivation (args // { name = "${name}-${version}"; diff --git a/nixpkgs/pkgs/desktops/plasma-5/discover.nix b/nixpkgs/pkgs/desktops/plasma-5/discover.nix index 75e0fd6917d5..e065837cd2fd 100644 --- a/nixpkgs/pkgs/desktops/plasma-5/discover.nix +++ b/nixpkgs/pkgs/desktops/plasma-5/discover.nix @@ -33,7 +33,6 @@ mkDerivation { name = "discover"; - meta.broken = lib.versionOlder qtbase.version "5.15.0"; nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python3 ]; buildInputs = [ # discount is needed for libmarkdown diff --git a/nixpkgs/pkgs/desktops/plasma-5/kactivitymanagerd.nix b/nixpkgs/pkgs/desktops/plasma-5/kactivitymanagerd.nix index 5c856b9d39c2..47543da11144 100644 --- a/nixpkgs/pkgs/desktops/plasma-5/kactivitymanagerd.nix +++ b/nixpkgs/pkgs/desktops/plasma-5/kactivitymanagerd.nix @@ -7,7 +7,6 @@ mkDerivation { name = "kactivitymanagerd"; - meta.broken = lib.versionOlder qtbase.version "5.15.0"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ boost kconfig kcoreaddons kdbusaddons kglobalaccel ki18n kio kwindowsystem diff --git a/nixpkgs/pkgs/desktops/plasma-5/kdecoration.nix b/nixpkgs/pkgs/desktops/plasma-5/kdecoration.nix index 9a09ce30f4c9..9b67d7bc5293 100644 --- a/nixpkgs/pkgs/desktops/plasma-5/kdecoration.nix +++ b/nixpkgs/pkgs/desktops/plasma-5/kdecoration.nix @@ -5,5 +5,4 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtbase ki18n ]; outputs = [ "out" "dev" ]; - meta.broken = lib.versionOlder qtbase.version "5.15.0"; } diff --git a/nixpkgs/pkgs/desktops/plasma-5/kgamma5.nix b/nixpkgs/pkgs/desktops/plasma-5/kgamma5.nix index e7cc42e77cd5..d371ce815107 100644 --- a/nixpkgs/pkgs/desktops/plasma-5/kgamma5.nix +++ b/nixpkgs/pkgs/desktops/plasma-5/kgamma5.nix @@ -8,5 +8,4 @@ mkDerivation { name = "kgamma5"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kconfig kconfigwidgets ki18n qtx11extras libXxf86vm ]; - meta.broken = lib.versionOlder qtbase.version "5.15"; } diff --git a/nixpkgs/pkgs/desktops/plasma-5/khotkeys.nix b/nixpkgs/pkgs/desktops/plasma-5/khotkeys.nix index ad78d602deca..fd366443861b 100644 --- a/nixpkgs/pkgs/desktops/plasma-5/khotkeys.nix +++ b/nixpkgs/pkgs/desktops/plasma-5/khotkeys.nix @@ -14,5 +14,4 @@ mkDerivation { plasma-framework plasma-workspace qtx11extras ]; outputs = [ "bin" "dev" "out" ]; - meta.broken = lib.versionOlder qtbase.version "5.14"; } diff --git a/nixpkgs/pkgs/desktops/plasma-5/kinfocenter.nix b/nixpkgs/pkgs/desktops/plasma-5/kinfocenter.nix index 23e225bd7440..f7f50dc3b57f 100644 --- a/nixpkgs/pkgs/desktops/plasma-5/kinfocenter.nix +++ b/nixpkgs/pkgs/desktops/plasma-5/kinfocenter.nix @@ -10,7 +10,6 @@ mkDerivation { name = "kinfocenter"; - meta.broken = lib.versionOlder qtbase.version "5.15.0"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kcmutils kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons diff --git a/nixpkgs/pkgs/desktops/plasma-5/kscreenlocker.nix b/nixpkgs/pkgs/desktops/plasma-5/kscreenlocker.nix index ace14b385e6b..2fc26216bf41 100644 --- a/nixpkgs/pkgs/desktops/plasma-5/kscreenlocker.nix +++ b/nixpkgs/pkgs/desktops/plasma-5/kscreenlocker.nix @@ -8,7 +8,6 @@ mkDerivation { name = "kscreenlocker"; - meta.broken = lib.versionOlder qtbase.version "5.15.0"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kcmutils kcrash kdeclarative kdelibs4support kglobalaccel kidletime kwayland diff --git a/nixpkgs/pkgs/desktops/plasma-5/ksshaskpass.nix b/nixpkgs/pkgs/desktops/plasma-5/ksshaskpass.nix index c4dabd71343e..bc6702ed6d3f 100644 --- a/nixpkgs/pkgs/desktops/plasma-5/ksshaskpass.nix +++ b/nixpkgs/pkgs/desktops/plasma-5/ksshaskpass.nix @@ -8,5 +8,4 @@ mkDerivation { name = "ksshaskpass"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kcoreaddons ki18n kwallet kwidgetsaddons qtbase ]; - meta.broken = lib.versionOlder qtbase.version "5.15.0"; } diff --git a/nixpkgs/pkgs/desktops/plasma-5/ksysguard.nix b/nixpkgs/pkgs/desktops/plasma-5/ksysguard.nix index 27d0ab8a0fba..fe904bb97a48 100644 --- a/nixpkgs/pkgs/desktops/plasma-5/ksysguard.nix +++ b/nixpkgs/pkgs/desktops/plasma-5/ksysguard.nix @@ -9,7 +9,6 @@ mkDerivation { name = "ksysguard"; - meta.broken = lib.versionOlder qtbase.version "5.15.0"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kconfig kcoreaddons kitemviews knewstuff kiconthemes libksysguard diff --git a/nixpkgs/pkgs/desktops/plasma-5/kwayland-integration.nix b/nixpkgs/pkgs/desktops/plasma-5/kwayland-integration.nix index 2e923094dc54..f886a87feb57 100644 --- a/nixpkgs/pkgs/desktops/plasma-5/kwayland-integration.nix +++ b/nixpkgs/pkgs/desktops/plasma-5/kwayland-integration.nix @@ -8,5 +8,4 @@ mkDerivation { name = "kwayland-integration"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kguiaddons kidletime kwindowsystem kwayland qtbase ]; - meta.broken = lib.versionOlder qtbase.version "5.15.0"; } diff --git a/nixpkgs/pkgs/desktops/plasma-5/kwayland-server/default.nix b/nixpkgs/pkgs/desktops/plasma-5/kwayland-server/default.nix index 6d2a3fabff2b..f24e0e6d6a04 100644 --- a/nixpkgs/pkgs/desktops/plasma-5/kwayland-server/default.nix +++ b/nixpkgs/pkgs/desktops/plasma-5/kwayland-server/default.nix @@ -15,5 +15,4 @@ mkDerivation { kwayland plasma-wayland-protocols wayland wayland-protocols ]; patches = [ ./0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch ]; - meta.broken = lib.versionOlder qtbase.version "5.15.0"; } diff --git a/nixpkgs/pkgs/desktops/plasma-5/kwrited.nix b/nixpkgs/pkgs/desktops/plasma-5/kwrited.nix index e6ee4829bcbf..bb8798d2d0e0 100644 --- a/nixpkgs/pkgs/desktops/plasma-5/kwrited.nix +++ b/nixpkgs/pkgs/desktops/plasma-5/kwrited.nix @@ -8,5 +8,4 @@ mkDerivation { name = "kwrited"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kcoreaddons kdbusaddons ki18n knotifications kpty qtbase ]; - meta.broken = lib.versionOlder qtbase.version "5.15.0"; } diff --git a/nixpkgs/pkgs/desktops/plasma-5/libkscreen/default.nix b/nixpkgs/pkgs/desktops/plasma-5/libkscreen/default.nix index 08a9e6f4f24b..5cd9ae94308a 100644 --- a/nixpkgs/pkgs/desktops/plasma-5/libkscreen/default.nix +++ b/nixpkgs/pkgs/desktops/plasma-5/libkscreen/default.nix @@ -6,9 +6,6 @@ mkDerivation { name = "libkscreen"; - meta = { - broken = lib.versionOlder qtbase.version "5.15.0"; - }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kwayland libXrandr qtx11extras ]; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/desktops/plasma-5/libksysguard/default.nix b/nixpkgs/pkgs/desktops/plasma-5/libksysguard/default.nix index 8178d4079500..e291bc5c4c40 100644 --- a/nixpkgs/pkgs/desktops/plasma-5/libksysguard/default.nix +++ b/nixpkgs/pkgs/desktops/plasma-5/libksysguard/default.nix @@ -8,7 +8,6 @@ mkDerivation { name = "libksysguard"; - meta.broken = lib.versionOlder qtbase.version "5.14.0"; patches = [ ./0001-qdiriterator-follow-symlinks.patch ]; diff --git a/nixpkgs/pkgs/desktops/plasma-5/milou.nix b/nixpkgs/pkgs/desktops/plasma-5/milou.nix index ab23703a470b..0e7169abf6f6 100644 --- a/nixpkgs/pkgs/desktops/plasma-5/milou.nix +++ b/nixpkgs/pkgs/desktops/plasma-5/milou.nix @@ -7,7 +7,6 @@ mkDerivation { name = "milou"; - meta.broken = lib.versionOlder qtbase.version "5.15.0"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kcoreaddons kdeclarative ki18n kitemmodels krunner kservice plasma-framework diff --git a/nixpkgs/pkgs/desktops/plasma-5/plasma-nm/default.nix b/nixpkgs/pkgs/desktops/plasma-5/plasma-nm/default.nix index 31fd35589577..585f7462c9bd 100644 --- a/nixpkgs/pkgs/desktops/plasma-5/plasma-nm/default.nix +++ b/nixpkgs/pkgs/desktops/plasma-5/plasma-nm/default.nix @@ -11,7 +11,6 @@ mkDerivation { name = "plasma-nm"; - meta.broken = lib.versionOlder qtbase.version "5.15.0"; nativeBuildInputs = [ extra-cmake-modules kdoctools qttools ]; buildInputs = [ kdeclarative kdelibs4support ki18n kio kwindowsystem plasma-framework diff --git a/nixpkgs/pkgs/desktops/plasma-5/plasma-pa.nix b/nixpkgs/pkgs/desktops/plasma-5/plasma-pa.nix index 00f5fefdc434..bc39e520f8a6 100644 --- a/nixpkgs/pkgs/desktops/plasma-5/plasma-pa.nix +++ b/nixpkgs/pkgs/desktops/plasma-5/plasma-pa.nix @@ -17,5 +17,4 @@ mkDerivation { qtbase qtdeclarative ]; - meta.broken = lib.versionOlder qtbase.version "5.15.0"; } diff --git a/nixpkgs/pkgs/desktops/plasma-5/plasma-systemmonitor.nix b/nixpkgs/pkgs/desktops/plasma-5/plasma-systemmonitor.nix index 6b875745d270..f69808bf4528 100644 --- a/nixpkgs/pkgs/desktops/plasma-5/plasma-systemmonitor.nix +++ b/nixpkgs/pkgs/desktops/plasma-5/plasma-systemmonitor.nix @@ -16,7 +16,6 @@ mkDerivation { name = "plasma-systemmonitor"; - meta.broken = lib.versionOlder qtbase.version "5.15.0"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ qtquickcontrols2 diff --git a/nixpkgs/pkgs/desktops/plasma-5/polkit-kde-agent.nix b/nixpkgs/pkgs/desktops/plasma-5/polkit-kde-agent.nix index 27f03e2d931e..72217204b35d 100644 --- a/nixpkgs/pkgs/desktops/plasma-5/polkit-kde-agent.nix +++ b/nixpkgs/pkgs/desktops/plasma-5/polkit-kde-agent.nix @@ -12,5 +12,4 @@ mkDerivation { knotifications kwindowsystem polkit-qt ]; outputs = [ "out" "dev" ]; - meta.broken = lib.versionOlder qtbase.version "5.15.0"; } diff --git a/nixpkgs/pkgs/desktops/plasma-5/sddm-kcm.nix b/nixpkgs/pkgs/desktops/plasma-5/sddm-kcm.nix index 9e3776e8e291..7c44e0f140d4 100644 --- a/nixpkgs/pkgs/desktops/plasma-5/sddm-kcm.nix +++ b/nixpkgs/pkgs/desktops/plasma-5/sddm-kcm.nix @@ -18,7 +18,6 @@ mkDerivation { name = "sddm-kcm"; - meta.broken = lib.versionOlder qtbase.version "5.15.0"; nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; buildInputs = [ libpthreadstubs diff --git a/nixpkgs/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix b/nixpkgs/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix index aade506483f8..f754bc5a46d4 100644 --- a/nixpkgs/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix +++ b/nixpkgs/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix @@ -9,7 +9,6 @@ mkDerivation { name = "xdg-desktop-portal-kde"; - meta.broken = lib.versionOlder qtbase.version "5.15.0"; nativeBuildInputs = [ extra-cmake-modules gettext kdoctools ]; buildInputs = [ cups epoxy mesa pcre pipewire wayland wayland-protocols |