Merge branch 'staging' into staging-next

A few conflicts but relatively clear ones (I think).
2021-04-14 10:08:25 +02:00
parent 3257feac49 25ae1fd29f
commit d2eb7a7887
675 changed files with 5919 additions and 3687 deletions
@@ -16,9 +16,11 @@
 , ninja
 , xkeyboard_config
 , libxkbfile
+, libXdamage
 , libxkbcommon
 , libXtst
 , libinput
+, libdrm
 , gsettings-desktop-schemas
 , glib
 , gtk3
@@ -27,6 +29,7 @@
 , libgudev
 , libwacom
 , xwayland
+, mesa
 , meson
 , gnome-settings-daemon
 , xorgserver
@@ -84,6 +87,7 @@ let self = stdenv.mkDerivation rec {
  nativeBuildInputs = [
    desktop-file-utils
    gettext
+    mesa # needed for gbm
    meson
    ninja
    pkg-config
@@ -102,12 +106,14 @@ let self = stdenv.mkDerivation rec {
    gsettings-desktop-schemas
    gtk3
    libcanberra
+    libdrm
    libgudev
    libinput
    libstartup_notification
    libwacom
    libxkbcommon
    libxkbfile
+    libXdamage
    pango
    pipewire
    sysprof
@@ -13,6 +13,7 @@
 , granite
 , gettext
 , mutter
+, mesa
 , json-glib
 , python3
 , elementary-gtk-theme
@@ -55,6 +56,7 @@ stdenv.mkDerivation rec {
    json-glib
    libgee
    mutter
+    mesa # for libEGL
  ];

  patches = [
@@ -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";
 }
@@ -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}";
@@ -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
@@ -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
@@ -5,5 +5,4 @@ mkDerivation {
  nativeBuildInputs = [ extra-cmake-modules ];
  buildInputs = [ qtbase ki18n ];
  outputs = [ "out" "dev" ];
-  meta.broken = lib.versionOlder qtbase.version "5.15.0";
 }
@@ -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";
 }
@@ -14,5 +14,4 @@ mkDerivation {
    plasma-framework plasma-workspace qtx11extras
  ];
  outputs = [ "bin" "dev" "out" ];
-  meta.broken = lib.versionOlder qtbase.version "5.14";
 }
@@ -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
@@ -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
@@ -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";
 }
@@ -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
@@ -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";
 }
@@ -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";
 }
@@ -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";
 }
@@ -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" ];
@@ -8,7 +8,6 @@

 mkDerivation {
  name = "libksysguard";
-  meta.broken = lib.versionOlder qtbase.version "5.14.0";
  patches = [
    ./0001-qdiriterator-follow-symlinks.patch
  ];
@@ -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
@@ -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
@@ -17,5 +17,4 @@ mkDerivation {

    qtbase qtdeclarative
  ];
-  meta.broken = lib.versionOlder qtbase.version "5.15.0";
 }
@@ -16,7 +16,6 @@

 mkDerivation {
  name = "plasma-systemmonitor";
-  meta.broken = lib.versionOlder qtbase.version "5.15.0";
  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
  buildInputs = [
    qtquickcontrols2
@@ -12,5 +12,4 @@ mkDerivation {
    knotifications kwindowsystem polkit-qt
  ];
  outputs = [ "out" "dev" ];
-  meta.broken = lib.versionOlder qtbase.version "5.15.0";
 }
@@ -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
@@ -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