Merge pull request #205921 from ulrikstrid/ulrikstrid--kde-frameworks…

…_5-101
NixOS · Dec 14, 2022 · b09d189 · b09d189
2 parents 8648765 + 85ef2eb
commit b09d189
Show file tree

Hide file tree

Showing 4 changed files with 341 additions and 335 deletions.
diff --git a/pkgs/data/themes/material-kwin-decoration/default.nix b/pkgs/data/themes/material-kwin-decoration/default.nix
@@ -26,6 +26,12 @@ mkDerivation rec {
     sha256 = "sha256-n+yUmBUrkS+06qLnzl2P6CTQZZbDtJLy+2mDPCcQz9M=";
   };
 
+  # Remove -Werror since it uses deprecated methods
+  postPatch = ''
+    substituteInPlace ./CMakeLists.txt \
+      --replace "add_definitions (-Wall -Werror)" "add_definitions (-Wall)"
+  '';
+
   nativeBuildInputs = [ cmake extra-cmake-modules ];
 
   buildInputs = [

diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/frameworks/5.100/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/frameworks/5.101/ -A '*.tar.xz' )
diff --git a/pkgs/development/libraries/kde-frameworks/kidletime.nix b/pkgs/development/libraries/kde-frameworks/kidletime.nix
@@ -2,12 +2,12 @@
   mkDerivation,
   extra-cmake-modules,
   qtbase, qtx11extras,
-  wayland, plasma-wayland-protocols
+  wayland, wayland-protocols, plasma-wayland-protocols
 }:
 
 mkDerivation {
   pname = "kidletime";
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtx11extras wayland plasma-wayland-protocols ];
+  buildInputs = [ qtx11extras wayland wayland-protocols plasma-wayland-protocols ];
   propagatedBuildInputs = [ qtbase ];
 }