Merge staging-next into staging

2020-11-01 11:06:35 +01:00
parent b9222f5158 fe9f55907e
commit 409ca6f1f9
15 changed files with 228 additions and 120 deletions
--- a/pkgs/data/icons/maia-icon-theme/default.nix
+++ b/pkgs/data/icons/maia-icon-theme/default.nix
@@ -1,4 +1,12 @@
-{ stdenv, fetchFromGitLab, cmake, extra-cmake-modules, gtk3, kdeFrameworks, hicolor-icon-theme }:
+{ stdenv
+, fetchFromGitLab
+, cmake
+, extra-cmake-modules
+, gtk3
+, plasma-framework
+, kwindowsystem
+, hicolor-icon-theme
+}:

 stdenv.mkDerivation {
  pname = "maia-icon-theme";
@@ -17,8 +25,8 @@ stdenv.mkDerivation {
    cmake
    extra-cmake-modules
    gtk3
-    kdeFrameworks.plasma-framework
-    kdeFrameworks.kwindowsystem
+    plasma-framework
+    kwindowsystem
  ];

  propagatedBuildInputs = [