From d60ec4fe579e24521b616ad15965e54975fecd7e Mon Sep 17 00:00:00 2001 From: rewine Date: Sun, 8 Oct 2023 20:19:30 +0800 Subject: [PATCH 1/5] wf-config: 0.7.1 -> 0.8.0 --- pkgs/applications/window-managers/wayfire/wf-config.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/wayfire/wf-config.nix b/pkgs/applications/window-managers/wayfire/wf-config.nix index 923c3930c9b8..0151ad66f4c4 100644 --- a/pkgs/applications/window-managers/wayfire/wf-config.nix +++ b/pkgs/applications/window-managers/wayfire/wf-config.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "wf-config"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "WayfireWM"; repo = "wf-config"; rev = "v${finalAttrs.version}"; - hash = "sha256-ADUBvDJcPYEB9ZvaFIgTfemo1WYwiWgCWX/z2yrEPtA="; + hash = "sha256-4QszCGlJqehnavTOdR2vZ95XuHKiNUIsA893sa9qph8="; }; nativeBuildInputs = [ From 3fb591bbf3270e5cfe557d0d6c5b4eefa2fbda2f Mon Sep 17 00:00:00 2001 From: rewine Date: Sun, 8 Oct 2023 20:25:14 +0800 Subject: [PATCH 2/5] wayfire: 0.7.5 -> 0.8.0 --- pkgs/applications/window-managers/wayfire/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/wayfire/default.nix b/pkgs/applications/window-managers/wayfire/default.nix index 133b561be621..8311c3690afb 100644 --- a/pkgs/applications/window-managers/wayfire/default.nix +++ b/pkgs/applications/window-managers/wayfire/default.nix @@ -10,6 +10,7 @@ , doctest , libdrm , libexecinfo +, libevdev , libinput , libjpeg , libxkbcommon @@ -18,19 +19,20 @@ , wayland-scanner , wlroots , pango +, nlohmann_json , xorg }: stdenv.mkDerivation (finalAttrs: { pname = "wayfire"; - version = "0.7.5"; + version = "0.8.0"; src = fetchFromGitHub { owner = "WayfireWM"; repo = "wayfire"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-Z+rR9pY244I3i/++XZ4ROIkq3vtzMgcxxHvJNxFD9is="; + hash = "sha256-YI8N1rY71b2ulv7tAdah7sibG4qq3kY0/hyS0cls5to="; }; nativeBuildInputs = [ @@ -44,6 +46,7 @@ stdenv.mkDerivation (finalAttrs: { wf-config libdrm libexecinfo + libevdev libinput libjpeg libxkbcommon @@ -52,6 +55,7 @@ stdenv.mkDerivation (finalAttrs: { wayland cairo pango + nlohmann_json ]; propagatedBuildInputs = [ From 92fc6409784fa2ff80ed29c9ed67fad40ce34f5a Mon Sep 17 00:00:00 2001 From: rewine Date: Sun, 8 Oct 2023 20:34:22 +0800 Subject: [PATCH 3/5] wayfirePlugins.wf-shell: 0.7.0 -> 0.8.0 --- pkgs/applications/window-managers/wayfire/wf-shell.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/wayfire/wf-shell.nix b/pkgs/applications/window-managers/wayfire/wf-shell.nix index 7af794db7886..229a87234924 100644 --- a/pkgs/applications/window-managers/wayfire/wf-shell.nix +++ b/pkgs/applications/window-managers/wayfire/wf-shell.nix @@ -11,18 +11,19 @@ , gtkmm3 , gtk-layer-shell , pulseaudio +, libdbusmenu-gtk3 }: stdenv.mkDerivation (finalAttrs: { pname = "wf-shell"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "WayfireWM"; repo = "wf-shell"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-iQUBuNjbZuf51A69RC6NsMHFZCFRv+d9XZ0HtP6OpOA="; + hash = "sha256-K5g9DfFlqZyPHDUswx3vtzh0D9ogOQ1p87ZrqyH35vs="; }; nativeBuildInputs = [ @@ -39,6 +40,7 @@ stdenv.mkDerivation (finalAttrs: { gtkmm3 gtk-layer-shell pulseaudio + libdbusmenu-gtk3 ]; mesonFlags = [ "--sysconfdir /etc" ]; From deb37c517b051ff75bf6e51948052f7beff138bd Mon Sep 17 00:00:00 2001 From: rewine Date: Sun, 8 Oct 2023 20:51:37 +0800 Subject: [PATCH 4/5] wayfirePlugins.wcm: 0.7.5 -> 0.8.0 --- pkgs/applications/window-managers/wayfire/wcm.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/wayfire/wcm.nix b/pkgs/applications/window-managers/wayfire/wcm.nix index 48be049560b5..1acd161e6211 100644 --- a/pkgs/applications/window-managers/wayfire/wcm.nix +++ b/pkgs/applications/window-managers/wayfire/wcm.nix @@ -12,20 +12,22 @@ , wayland-scanner , wayland-protocols , gtk3 +, gtkmm3 , libevdev , libxml2 +, libxkbcommon }: stdenv.mkDerivation (finalAttrs: { pname = "wcm"; - version = "0.7.5"; + version = "0.8.0"; src = fetchFromGitHub { owner = "WayfireWM"; repo = "wcm"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-LJR9JGl49o4O6LARofz3jOeAqseGcmzVhMnhk/aobUU="; + hash = "sha256-UwHJ4Wi83ATnA1CQKNSt8Qga7ooLnAY7QARz2FXvUIo="; }; nativeBuildInputs = [ @@ -43,8 +45,10 @@ stdenv.mkDerivation (finalAttrs: { wayland wayland-protocols gtk3 + gtkmm3 libevdev libxml2 + libxkbcommon ]; mesonFlags = [ From 14ab9be9bbf7fa87ff852f3acc20cae8fe8df4bb Mon Sep 17 00:00:00 2001 From: rewine Date: Sun, 8 Oct 2023 20:50:32 +0800 Subject: [PATCH 5/5] wayfirePlugins.wayfire-plugins-extra: 0.7.5 -> 0.8.0 --- .../wayfire/wayfire-plugins-extra.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/wayfire/wayfire-plugins-extra.nix b/pkgs/applications/window-managers/wayfire/wayfire-plugins-extra.nix index 110fcfe75ff8..965266444369 100644 --- a/pkgs/applications/window-managers/wayfire/wayfire-plugins-extra.nix +++ b/pkgs/applications/window-managers/wayfire/wayfire-plugins-extra.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , meson , ninja , pkg-config @@ -8,22 +9,32 @@ , wf-config , gtkmm3 , gtk-layer-shell +, libevdev +, libinput , libxkbcommon , xcbutilwm }: stdenv.mkDerivation (finalAttrs: { pname = "wayfire-plugins-extra"; - version = "0.7.5"; + version = "0.8.0"; src = fetchFromGitHub { owner = "WayfireWM"; repo = "wayfire-plugins-extra"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-hnsRwIrl0+pRKhRlrF/Wdlu6HkzLfYukGk4Hzx3wNeo="; + hash = "sha256-OVyP1AgZ1d9DXFkbHnROwtSQIquEX5ccVIkcmCdDZtA="; }; + patches = [ + (fetchpatch { + name = "check-dependency-libevdev.patch"; + url = "https://github.com/WayfireWM/wayfire-plugins-extra/commit/f3bbf1fcbafd28016e36be7a5043bd82574ac9e4.patch"; + hash = "sha256-8X1lpf8H8NuA845cIslahKDQKW/IA/KiMExU4Snk72o="; + }) + ]; + postPatch = '' substituteInPlace metadata/meson.build \ --replace "wayfire.get_variable(pkgconfig: 'metadatadir')" "join_paths(get_option('prefix'), 'share/wayfire/metadata')" @@ -38,6 +49,8 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ wayfire wf-config + libevdev + libinput libxkbcommon xcbutilwm gtkmm3