about summary refs log tree commit diff
path: root/pkgs/development/tools/wlcs
diff options
context:
space:
mode:
authorOPNA2608 <christoph.neidahl@gmail.com>2023-01-20 17:43:33 +0100
committerOPNA2608 <christoph.neidahl@gmail.com>2023-01-21 00:22:13 +0100
commit4abd5f04c6c0e5ee7dcbb1498e4a6d3dc01bb47d (patch)
tree2be03b034249781f33fab4da1cc2261b54569f40 /pkgs/development/tools/wlcs
parent5b23e40efb9f3b35690b4e3680f93882cd76a6a3 (diff)
wlcs: 1.4.0 -> 1.5.0, mark Linux-only
Can't inherit platforms from `wayland` because it builds 3 test files on Darwin, which is not enough to build `wlcs`.
Diffstat (limited to 'pkgs/development/tools/wlcs')
-rw-r--r--pkgs/development/tools/wlcs/default.nix21
1 files changed, 8 insertions, 13 deletions
diff --git a/pkgs/development/tools/wlcs/default.nix b/pkgs/development/tools/wlcs/default.nix
index f2075f683b1eb..7a5470a33423d 100644
--- a/pkgs/development/tools/wlcs/default.nix
+++ b/pkgs/development/tools/wlcs/default.nix
@@ -12,27 +12,22 @@
 
 stdenv.mkDerivation rec {
   pname = "wlcs";
-  version = "1.4.0";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "MirServer";
     repo = "wlcs";
     rev = "v${version}";
-    hash = "sha256-ep5BHa9PgfB50gxJySaw0YAc1upBbncOiX9PCqHLbpE=";
+    hash = "sha256-QxmWxu+w77/WE5pGXMWXm+NP95QmYo2O8ltZYrgCIWw=";
   };
 
   patches = [
-    # Fixes pkg-config paths
-    # Remove when https://github.com/MirServer/wlcs/pull/258 merged & in a release
+    # 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-FULL-install-vars.patch";
-      url = "https://github.com/MirServer/wlcs/pull/258/commits/9002cb7323d94aba7fc1ce5927f445e9beb30d70.patch";
-      hash = "sha256-+uhFRKhG59w99oES4RA+L5hHyJ5pf4ij97pTokERPys=";
-    })
-    (fetchpatch {
-      name = "0002-wlcs-CMAKE_INSTALL_INCLUDEDIR-for-headers.patch";
-      url = "https://github.com/MirServer/wlcs/pull/258/commits/71263172c9ba57be9c05f1e07dd40d1f378ca6d0.patch";
-      hash = "sha256-nV/72W9DW3AvNGhUZ+tzmQZow3BkxEH3D6QFBZIGjj8=";
+      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=";
     })
   ];
 
@@ -72,6 +67,6 @@ stdenv.mkDerivation rec {
     changelog = "https://github.com/MirServer/wlcs/releases/tag/v${version}";
     license = licenses.gpl3Only;
     maintainers = with maintainers; [ OPNA2608 ];
-    inherit (wayland.meta) platforms;
+    platforms = platforms.linux;
   };
 }