Unverified Commit 06a1542e authored by rewine's avatar rewine Committed by GitHub
Browse files

wayfire: 0.9.0 -> 0.10.0 (#460056)

parents 19d0d2c9 d595d3b5
Loading
Loading
Loading
Loading
+18 −5
Original line number Diff line number Diff line
@@ -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 "<drm_fourcc.h>" "<libdrm/drm_fourcc.h>"
  '';

  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
    ];
+0 −59
Original line number Diff line number Diff line
{
  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;
  };
})
+4 −4
Original line number Diff line number Diff line
@@ -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";
}
+17 −8
Original line number Diff line number Diff line
@@ -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 = {
+0 −54
Original line number Diff line number Diff line
{
  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;
  };
})
Loading