diff --git a/pkgs/applications/window-managers/wayfire/default.nix b/pkgs/applications/window-managers/wayfire/default.nix index d03bed7e7a49..49acba82cc61 100644 --- a/pkgs/applications/window-managers/wayfire/default.nix +++ b/pkgs/applications/window-managers/wayfire/default.nix @@ -17,27 +17,37 @@ libinput, libjpeg, libxkbcommon, + libxml2, + vulkan-headers, wayland, wayland-protocols, wayland-scanner, - wlroots, + wlroots_0_19, pango, - nlohmann_json, xorg, + yyjson, }: +let + wlroots = wlroots_0_19; +in stdenv.mkDerivation (finalAttrs: { pname = "wayfire"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "WayfireWM"; repo = "wayfire"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-xQZ4/UE66IISZQLl702OQXAAr8XmEsA4hJwB7aXua+E="; + hash = "sha256-rnrcuikfRPnIfIkmKUIRh8Sm+POwFLzaZZMAlmeBdjY="; }; + postPatch = '' + substituteInPlace plugins/common/wayfire/plugins/common/cairo-util.hpp \ + --replace "" "" + ''; + nativeBuildInputs = [ meson ninja @@ -53,9 +63,11 @@ stdenv.mkDerivation (finalAttrs: { libinput libjpeg libxkbcommon + libxml2 + vulkan-headers wayland-protocols xorg.xcbutilwm - nlohmann_json + yyjson ]; propagatedBuildInputs = [ @@ -92,6 +104,7 @@ stdenv.mkDerivation (finalAttrs: { description = "3D Wayland compositor"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ + teatwig wucke13 wineee ]; diff --git a/pkgs/applications/window-managers/wayfire/focus-request.nix b/pkgs/applications/window-managers/wayfire/focus-request.nix deleted file mode 100644 index 2b7bd6fad686..000000000000 --- a/pkgs/applications/window-managers/wayfire/focus-request.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitLab, - meson, - ninja, - pkg-config, - wayfire, - wf-config, - wayland, - pango, - libinput, - libxkbcommon, - librsvg, - libGL, - xcbutilwm, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "focus-request"; - version = "0.8.0.2"; - - src = fetchFromGitLab { - owner = "wayfireplugins"; - repo = "focus-request"; - rev = "v${finalAttrs.version}"; - hash = "sha256-kUYvLC28IPrvnMT/wKFRlOVkc2ohF3k0T/Qrm/zVkpE="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - ]; - - buildInputs = [ - wayfire - wf-config - wayland - pango - libinput - libxkbcommon - librsvg - libGL - xcbutilwm - ]; - - env = { - PKG_CONFIG_WAYFIRE_METADATADIR = "${placeholder "out"}/share/wayfire/metadata"; - }; - - meta = { - homepage = "https://gitlab.com/wayfireplugins/focus-request"; - description = "Wayfire plugin provides a mechanism to grant focus to views that make a focus self-request"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ wineee ]; - inherit (wayfire.meta) platforms; - }; -}) diff --git a/pkgs/applications/window-managers/wayfire/plugins.nix b/pkgs/applications/window-managers/wayfire/plugins.nix index d456058c245c..4835e498c388 100644 --- a/pkgs/applications/window-managers/wayfire/plugins.nix +++ b/pkgs/applications/window-managers/wayfire/plugins.nix @@ -10,15 +10,15 @@ lib.makeScope pkgs.newScope ( inherit (self) callPackage; in { - focus-request = callPackage ./focus-request.nix { }; wayfire-plugins-extra = callPackage ./wayfire-plugins-extra.nix { }; - wayfire-shadows = callPackage ./wayfire-shadows.nix { }; wcm = callPackage ./wcm.nix { }; wf-shell = callPackage ./wf-shell.nix { }; - windecor = callPackage ./windecor.nix { }; - wwp-switcher = callPackage ./wwp-switcher.nix { }; } ) // lib.optionalAttrs config.allowAliases { firedecor = throw "wayfirePlugins.firedecor has been removed as it is unmaintained and no longer used by mate-wayland-session."; # Added 2025-09-03 + focus-request = throw "wayfirePlugins.focus-request is now included with wayfirePlugins.wayfire-plugins-extra"; + wayfire-shadows = throw "wayfirePlugins.wayfire-shadows is now included with wayfirePlugins.wayfire-plugins-extra"; + windecor = throw "wayfirePlugins.windecor has been removed as it is unmaintained"; + wwp-switcher = throw "wayfirePlugins.wwp-switcher has been removed as it is unmaintained"; } diff --git a/pkgs/applications/window-managers/wayfire/wayfire-plugins-extra.nix b/pkgs/applications/window-managers/wayfire/wayfire-plugins-extra.nix index 8a5801ec2237..2a96830ffef7 100644 --- a/pkgs/applications/window-managers/wayfire/wayfire-plugins-extra.nix +++ b/pkgs/applications/window-managers/wayfire/wayfire-plugins-extra.nix @@ -8,23 +8,30 @@ wayfire, wayland-scanner, wf-config, + boost, + libdrm, libevdev, libinput, libxkbcommon, - nlohmann_json, + vulkan-headers, xcbutilwm, gtkmm3, + withFiltersPlugin ? true, + withFocusRequestPlugin ? true, + withPixdecorPlugin ? true, + withWayfireShadowsPlugin ? true, }: stdenv.mkDerivation (finalAttrs: { pname = "wayfire-plugins-extra"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "WayfireWM"; repo = "wayfire-plugins-extra"; rev = "v${finalAttrs.version}"; - hash = "sha256-TukDomxqfrM45+C7azfO8jVaqk3E5irdphH8U5IYItg="; + hash = "sha256-C5dgs81R4XuPjIm7sj1Mtu4IMIRBEYU6izg2olymeVI="; + fetchSubmodules = true; }; nativeBuildInputs = [ @@ -37,19 +44,21 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ wayfire wf-config + boost + libdrm libevdev libinput libxkbcommon - nlohmann_json + vulkan-headers xcbutilwm gtkmm3 ]; mesonFlags = [ - # plugins in submodule, packaged individually - (lib.mesonBool "enable_windecor" false) - (lib.mesonBool "enable_wayfire_shadows" false) - (lib.mesonBool "enable_focus_request" false) + (lib.mesonBool "enable_filters" withFiltersPlugin) + (lib.mesonBool "enable_focus_request" withFocusRequestPlugin) + (lib.mesonBool "enable_pixdecor" withPixdecorPlugin) + (lib.mesonBool "enable_wayfire_shadows" withWayfireShadowsPlugin) ]; env = { diff --git a/pkgs/applications/window-managers/wayfire/wayfire-shadows.nix b/pkgs/applications/window-managers/wayfire/wayfire-shadows.nix deleted file mode 100644 index 9aef4a60e18f..000000000000 --- a/pkgs/applications/window-managers/wayfire/wayfire-shadows.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - unstableGitUpdater, - meson, - ninja, - pkg-config, - wayfire, - libxkbcommon, - libGL, - libinput, - xcbutilwm, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "wayfire-shadows"; - version = "0-unstable-2025-03-04"; - - src = fetchFromGitHub { - owner = "timgott"; - repo = "wayfire-shadows"; - rev = "8257a4f04670d8baf29e2d9cee0d78f978f0233f"; - hash = "sha256-cRayvjbolVxWtr1PbLSjxtIpZogTJaoAMxPOcZ+zBT8="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - ]; - - buildInputs = [ - wayfire - libxkbcommon - libGL - libinput - xcbutilwm - ]; - - env = { - PKG_CONFIG_WAYFIRE_METADATADIR = "${placeholder "out"}/share/wayfire/metadata"; - }; - - passthru.updateScript = unstableGitUpdater { }; - - meta = { - homepage = "https://github.com/timgott/wayfire-shadows"; - description = "Wayfire plugin that adds window shadows"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ wineee ]; - inherit (wayfire.meta) platforms; - }; -}) diff --git a/pkgs/applications/window-managers/wayfire/wcm.nix b/pkgs/applications/window-managers/wayfire/wcm.nix index bd23d4faea00..cc9902acc0dc 100644 --- a/pkgs/applications/window-managers/wayfire/wcm.nix +++ b/pkgs/applications/window-managers/wayfire/wcm.nix @@ -19,14 +19,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "wcm"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "WayfireWM"; repo = "wcm"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-oaaEtyu/9XVhFTkmD7WjScMycpKf+M7oPyQatbY23Vo="; + hash = "sha256-O4BYwb+GOMZIn3I2B/WMJ5tUZlaegvwBuyNK9l/gxvQ="; }; nativeBuildInputs = [ @@ -48,15 +48,12 @@ stdenv.mkDerivation (finalAttrs: { libxkbcommon ]; - mesonFlags = [ - "-Denable_wdisplays=false" - ]; - meta = { homepage = "https://github.com/WayfireWM/wcm"; description = "Wayfire Config Manager"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ + teatwig wucke13 wineee ]; diff --git a/pkgs/applications/window-managers/wayfire/wf-config.nix b/pkgs/applications/window-managers/wayfire/wf-config.nix index 995a71c6a3f5..544f577714c7 100644 --- a/pkgs/applications/window-managers/wayfire/wf-config.nix +++ b/pkgs/applications/window-managers/wayfire/wf-config.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "wf-config"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "WayfireWM"; repo = "wf-config"; rev = "v${finalAttrs.version}"; - hash = "sha256-5HejuluCTsRsnHuaMCTnCPkbFvT/IcLkfNGjnXnZjJ0="; + hash = "sha256-WcGt6yl2LpLnAOVtiCyMyWsoMAUMG1MYhvW/m2DDMX4="; }; nativeBuildInputs = [ @@ -60,6 +60,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Library for managing configuration files, written for Wayfire"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ + teatwig wucke13 wineee ]; diff --git a/pkgs/applications/window-managers/wayfire/windecor.nix b/pkgs/applications/window-managers/wayfire/windecor.nix deleted file mode 100644 index efe72b855df0..000000000000 --- a/pkgs/applications/window-managers/wayfire/windecor.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitLab, - meson, - ninja, - pkg-config, - wayfire, - eudev, - libinput, - libxkbcommon, - librsvg, - libGL, - xcbutilwm, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "windecor"; - version = "0.8.0"; - - src = fetchFromGitLab { - owner = "wayfireplugins"; - repo = "windecor"; - rev = "v${finalAttrs.version}"; - hash = "sha256-v0kGT+KrtfFJ/hp1Dr8izKVj6UHhuW6udHFjWt1y9TY="; - }; - - postPatch = '' - substituteInPlace meson.build \ - --replace "wayfire.get_variable( pkgconfig: 'metadatadir' )" "join_paths(get_option('prefix'), 'share/wayfire/metadata')" - ''; - - nativeBuildInputs = [ - meson - ninja - pkg-config - ]; - - buildInputs = [ - wayfire - eudev - libinput - libxkbcommon - librsvg - libGL - xcbutilwm - ]; - - mesonFlags = [ "--sysconfdir=/etc" ]; - - meta = { - homepage = "https://gitlab.com/wayfireplugins/windecor"; - description = "Window decoration plugin for wayfire"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ wineee ]; - inherit (wayfire.meta) platforms; - }; -}) diff --git a/pkgs/applications/window-managers/wayfire/wwp-switcher.nix b/pkgs/applications/window-managers/wayfire/wwp-switcher.nix deleted file mode 100644 index afe50faba5b5..000000000000 --- a/pkgs/applications/window-managers/wayfire/wwp-switcher.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - unstableGitUpdater, - meson, - ninja, - pkg-config, - wayfire, - libxkbcommon, - libGL, - libinput, - gtk3, - glibmm, - xcbutilwm, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "wwp-switcher"; - version = "0-unstable-2024-07-23"; - - src = fetchFromGitHub { - owner = "wb9688"; - repo = "wwp-switcher"; - rev = "d0cd97534a2a6355697efecb7bcf8f85f5dc4b5b"; - hash = "sha256-cU8INUb+JXlSCM7cAOUBU7z7W0IM6pAGN0izGdFYntc="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - ]; - - buildInputs = [ - wayfire - libxkbcommon - libGL - libinput - gtk3 - glibmm - xcbutilwm - ]; - - env = { - PKG_CONFIG_WAYFIRE_METADATADIR = "${placeholder "out"}/share/wayfire/metadata"; - }; - - passthru.updateScript = unstableGitUpdater { }; - - meta = { - homepage = "https://github.com/wb9688/wwp-switcher"; - description = "Plugin to switch active window"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ wineee ]; - inherit (wayfire.meta) platforms; - }; -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8fbe9ed5a417..301042a79e1b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12618,9 +12618,7 @@ with pkgs; imlib2 = imlib2-nox; }; - wayfire = callPackage ../applications/window-managers/wayfire/default.nix { - wlroots = wlroots_0_17; - }; + wayfire = callPackage ../applications/window-managers/wayfire/default.nix { }; wf-config = callPackage ../applications/window-managers/wayfire/wf-config.nix { }; wayfirePlugins = recurseIntoAttrs (