Commit d6647404 authored by tea's avatar tea
Browse files

wayfire: 0.9.0 -> 0.10.0

parent 049ae4af

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

+17 −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 = [

pkgs/top-level/all-packages.nix

+1 −3
Original line number Diff line number Diff line
@@ -12924,9 +12924,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 (