From 676c18e5b99f01ebe0d3b934029eb5e0b61d04bd Mon Sep 17 00:00:00 2001
From: OPNA2608 <christoph.neidahl@gmail.com>
Date: Fri, 28 Jul 2023 12:11:37 +0200
Subject: wlcs: 1.5.0 -> 1.6.0

---
 pkgs/development/tools/wlcs/default.nix | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/tools/wlcs/default.nix b/pkgs/development/tools/wlcs/default.nix
index 47c48aaa8417..2f666bf70976 100644
--- a/pkgs/development/tools/wlcs/default.nix
+++ b/pkgs/development/tools/wlcs/default.nix
@@ -2,7 +2,6 @@
 , lib
 , gitUpdater
 , fetchFromGitHub
-, fetchpatch
 , cmake
 , pkg-config
 , boost
@@ -12,25 +11,15 @@
 
 stdenv.mkDerivation rec {
   pname = "wlcs";
-  version = "1.5.0";
+  version = "1.6.0";
 
   src = fetchFromGitHub {
     owner = "MirServer";
     repo = "wlcs";
     rev = "v${version}";
-    hash = "sha256-QxmWxu+w77/WE5pGXMWXm+NP95QmYo2O8ltZYrgCIWw=";
+    hash = "sha256-+YM5dT45p9wk0gJeATmhWDFJJMaUdcTfw8GLS/vMkw4=";
   };
 
-  patches = [
-    # Improves pkg-config paths even more
-    # Remove when https://github.com/MirServer/wlcs/pull/260 merged & in a release
-    (fetchpatch {
-      name = "0001-wlcs-pkgsconfig-Use-better-path-concatenations.patch";
-      url = "https://github.com/MirServer/wlcs/pull/260/commits/20f28d82fa4dfa6a6e27212dbd6b0f2e8a833c69.patch";
-      hash = "sha256-m8zPD27JbX/vN2YQgNhcRsh/O+qLfvoeky5E5ZEeD1I=";
-    })
-  ];
-
   nativeBuildInputs = [
     cmake
     pkg-config
@@ -42,11 +31,6 @@ stdenv.mkDerivation rec {
     wayland
   ];
 
-  env.NIX_CFLAGS_COMPILE = toString [
-    # Needed with GCC 12
-    "-Wno-error=maybe-uninitialized"
-  ];
-
   passthru.updateScript = gitUpdater {
     rev-prefix = "v";
   };
-- 
cgit v1.2.3