Unverified Commit 4231696a authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #259755 from wineee/wayfire 

wayfire-with-plugins: 0.7.5 -> 0.8.0
parents 8531a0f1 14ab9be9

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

+6 −2
Original line number Diff line number Diff line
@@ -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 = [

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

+15 −2
Original line number Diff line number Diff line 
{ 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

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

+6 −2
Original line number Diff line number Diff line
@@ -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 = [

pkgs/applications/window-managers/wayfire/wf-config.nix

+2 −2
Original line number Diff line number Diff line
@@ -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 = [

pkgs/applications/window-managers/wayfire/wf-shell.nix

+4 −2
Original line number Diff line number Diff line
@@ -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" ];