diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-02-02 12:01:33 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-02 12:01:33 +0000 |
commit | fffb187b8ebea382b02a70d20dee945fbadd3359 (patch) | |
tree | 910d6bc257e553c0dd2eabf1c263de6d9b7ed7fd /pkgs/development/tools/wlcs | |
parent | f9b171789ead238acb23aa07e2b535f059a5e32c (diff) | |
parent | dc109a3192fe7fd8c3c4c447cdbf50d5a518271f (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/tools/wlcs')
-rw-r--r-- | pkgs/development/tools/wlcs/default.nix | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/pkgs/development/tools/wlcs/default.nix b/pkgs/development/tools/wlcs/default.nix index 558a05730c6f6..4ec4403987a3c 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="; }) ]; @@ -77,6 +72,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; }; } |