diff options
author | Alyssa Ross <hi@alyssa.is> | 2020-08-27 14:34:43 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-08-27 14:34:43 +0000 |
commit | 23fa25640d5c67092f50d9f1663f832f8ea70bfe (patch) | |
tree | 67404489680e3006c3f0e5ea8921dd07437c3402 /pkgs/applications/window-managers/wayfire/wcm.nix | |
parent | c901f337b8fed63ba0bb53674950ce4c7bf94dcd (diff) | |
parent | ea464f4b636ce1667e6e79b9f38707b730d93da3 (diff) | |
download | nixpkgs-23fa25640d5c67092f50d9f1663f832f8ea70bfe.tar nixpkgs-23fa25640d5c67092f50d9f1663f832f8ea70bfe.tar.gz nixpkgs-23fa25640d5c67092f50d9f1663f832f8ea70bfe.tar.bz2 nixpkgs-23fa25640d5c67092f50d9f1663f832f8ea70bfe.tar.lz nixpkgs-23fa25640d5c67092f50d9f1663f832f8ea70bfe.tar.xz nixpkgs-23fa25640d5c67092f50d9f1663f832f8ea70bfe.tar.zst nixpkgs-23fa25640d5c67092f50d9f1663f832f8ea70bfe.zip |
Merge branch 'upstream-merge' into master
Diffstat (limited to 'pkgs/applications/window-managers/wayfire/wcm.nix')
-rw-r--r-- | pkgs/applications/window-managers/wayfire/wcm.nix | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/pkgs/applications/window-managers/wayfire/wcm.nix b/pkgs/applications/window-managers/wayfire/wcm.nix index 7c246d9e0f7..d8ffe22d58c 100644 --- a/pkgs/applications/window-managers/wayfire/wcm.nix +++ b/pkgs/applications/window-managers/wayfire/wcm.nix @@ -1,36 +1,18 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, meson, ninja, pkg-config, wayland +{ stdenv, lib, fetchFromGitHub, meson, ninja, pkg-config, wayland , gnome3, libevdev, libxml2, wayfire, wayland-protocols, wf-config, wf-shell }: stdenv.mkDerivation rec { pname = "wcm"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "WayfireWM"; repo = "wcm"; rev = "v${version}"; - sha256 = "0irypa0814nmsmi9s8wxwfs507w41g41zjv8dkp0fdhg0429zxwa"; + sha256 = "1b22gymqfn0c49nf39676q5bj25rxab874iayiq31cmn14r30dyg"; }; - patches = [ - # The following three patches add support for loading Wayfire - # plugin metadata from outside of Wayfire's prefix. Remove if - # <https://github.com/WayfireWM/wcm/pull/18> is applied upstream. - (fetchpatch { - url = "https://github.com/WayfireWM/wcm/commit/8930ce96f51175947c42a605a520adc7282138ef.patch"; - sha256 = "10s3jikm99msxx73k6ccam8jlpdvvy379mifks4zmpfbag9ammrl"; - }) - (fetchpatch { - url = "https://github.com/WayfireWM/wcm/commit/07dfe16bf83ca3389ddfa8b1f90afee0a8c16135.patch"; - sha256 = "1hgqzqpf2anyhfb1bl4v3n2vwsw0w7far651p7aisn9vr6iqbmls"; - }) - (fetchpatch { - url = "https://github.com/WayfireWM/wcm/commit/0864c3d842ca1dfe6b2d25013941a7679d867458.patch"; - sha256 = "1z4zjl9al09wgb39gyc4g2ib5kkzppq37zla6ncmhmglis4l8arn"; - }) - ]; - strictDeps = true; nativeBuildInputs = [ meson ninja pkg-config wayland ]; buildInputs = [ |