Unverified Commit e332b3bb authored by Bobby Rong's avatar Bobby Rong Committed by GitHub
Browse files

Merge pull request #296824 from wineee/wayfire-0.8.1 

{wayfire, wayfire-plugins-extra}: 0.8.0 -> 0.8.1; wayfirePlugins.{focus-request,wayfire-shadows,wwp-switcher}: init
parents 07cc2232 efae95be

pkgs/applications/window-managers/wayfire/default.nix

+9 −6
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitHub

, nixosTests

, cmake

, meson

, ninja
@@ -26,14 +27,14 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "wayfire";

  version = "0.8.0";

  version = "0.8.1";



  src = fetchFromGitHub {

    owner = "WayfireWM";

    repo = "wayfire";

    rev = "v${finalAttrs.version}";

    fetchSubmodules = true;

    hash = "sha256-YI8N1rY71b2ulv7tAdah7sibG4qq3kY0/hyS0cls5to=";

    hash = "sha256-OPGzPy0I6i3TvmA5KSWDb4Lsf66zM5X+Akckgs3wk2o=";

  };



  nativeBuildInputs = [
@@ -44,7 +45,6 @@ stdenv.mkDerivation (finalAttrs: { 
  ];



  buildInputs = [

    wf-config

    libGL

    libdrm

    libexecinfo
@@ -54,14 +54,15 @@ stdenv.mkDerivation (finalAttrs: { 
    libxkbcommon

    wayland-protocols

    xorg.xcbutilwm

    wayland

    cairo

    pango

    nlohmann_json

  ];



  propagatedBuildInputs = [

    wf-config

    wlroots

    wayland

    cairo

    pango

  ];



  nativeCheckInputs = [
@@ -83,6 +84,8 @@ stdenv.mkDerivation (finalAttrs: { 


  passthru.providedSessions = [ "wayfire" ];



  passthru.tests.mate = nixosTests.mate-wayland;



  meta = {

    homepage = "https://wayfire.org/";

    description = "3D Wayland compositor";

pkgs/applications/window-managers/wayfire/firedecor.nix

+0 −8
Original line number Diff line number Diff line
@@ -5,17 +5,13 @@ 
, ninja

, pkg-config

, boost

, cairo

, glib

, libGL

, libinput

, librsvg

, libxkbcommon

, pango

, udev

, wayfire

, wayland

, wf-config

, xcbutilwm

, mate

}:
@@ -39,17 +35,13 @@ stdenv.mkDerivation (finalAttrs: { 


  buildInputs = [

    boost

    cairo

    glib

    libGL

    libinput

    librsvg

    libxkbcommon

    pango

    udev

    wayfire

    wayland

    wf-config

    xcbutilwm

  ];

pkgs/applications/window-managers/wayfire/focus-request.nix

0 → 100644
+58 −0
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-v0kGT+KrtfFJ/hp1Dr8izKVj6UHhuW6udHFjWt1y9TY=";

  };



  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 = "The wayfire plugin provides a mechanism to grant focus to views that make a focus self-request";

    license = lib.licenses.mit;

    maintainers = with lib.maintainers; [ rewine ];

    inherit (wayfire.meta) platforms;

  };

})

pkgs/applications/window-managers/wayfire/plugins.nix

+3 −0
Original line number Diff line number Diff line
@@ -5,9 +5,12 @@ lib.makeScope pkgs.newScope (self: 
    inherit (self) callPackage;

  in {

    firedecor = callPackage ./firedecor.nix { };

    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 { };

  }

)

pkgs/applications/window-managers/wayfire/wayfire-plugins-extra.nix

+16 −20
Original line number Diff line number Diff line 
{ stdenv

, lib

, fetchFromGitHub

, fetchpatch

, meson

, ninja

, pkg-config

, wayfire

, wf-config

, gtkmm3

, gtk-layer-shell

, libevdev

, libinput

, libxkbcommon

, nlohmann_json

, xcbutilwm

, gtkmm3

, gtk-layer-shell

}:



stdenv.mkDerivation (finalAttrs: {

  pname = "wayfire-plugins-extra";

  version = "0.8.0";

  version = "0.8.1";



  src = fetchFromGitHub {

    owner = "WayfireWM";

    repo = "wayfire-plugins-extra";

    rev = "v${finalAttrs.version}";

    fetchSubmodules = true;

    hash = "sha256-OVyP1AgZ1d9DXFkbHnROwtSQIquEX5ccVIkcmCdDZtA=";

    hash = "sha256-MF4tDzIZnnTXH2ZUxltIw1RP3pfRQFGrc/n9H47yW0g";

  };



  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')"

  '';



  nativeBuildInputs = [

    meson

    ninja
@@ -52,12 +38,22 @@ stdenv.mkDerivation (finalAttrs: { 
    libevdev

    libinput

    libxkbcommon

    nlohmann_json

    xcbutilwm

    gtkmm3

    gtk-layer-shell

  ];



  mesonFlags = [ "--sysconfdir /etc" ];

  mesonFlags = [

    # plugins in submodule, packaged individually

    (lib.mesonBool "enable_windecor" false)

    (lib.mesonBool "enable_wayfire_shadows" false)

    (lib.mesonBool "enable_focus_request" false)

  ];



  env = {

    PKG_CONFIG_WAYFIRE_METADATADIR = "${placeholder "out"}/share/wayfire/metadata";

  };



  meta = {

    homepage = "https://github.com/WayfireWM/wayfire-plugins-extra";