wayfire: 0.7.1 -> 0.7.2

This commit is contained in:
Alyssa Ross 2021-06-24 15:13:35 +00:00 committed by Michael Weiss
parent 203c8edcda
commit 738065bfc4
No known key found for this signature in database
GPG key ID: 5BE487C4D4771D83
2 changed files with 10 additions and 8 deletions

View file

@ -1,23 +1,26 @@
{ lib, stdenv, fetchurl, meson, ninja, pkg-config
, cairo, libdrm, libexecinfo, libinput, libjpeg, libxkbcommon, wayland
{ lib, stdenv, fetchurl, cmake, meson, ninja, pkg-config
, cairo, doctest, libdrm, libexecinfo, libinput, libjpeg, libxkbcommon, wayland
, wayland-protocols, wf-config, wlroots, mesa
}:
stdenv.mkDerivation rec {
pname = "wayfire";
version = "0.7.1";
version = "0.7.2";
src = fetchurl {
url = "https://github.com/WayfireWM/wayfire/releases/download/v${version}/wayfire-${version}.tar.xz";
sha256 = "0wgvwbmdhn7gkdr2jl9jndgvl6w4x7ys8gmpj55gqh9b57wqhyaq";
sha256 = "1gasijjyfl00zpy6j9hh6qpwv0sw42h9irycbnm693j3vw9mcy66";
};
nativeBuildInputs = [ meson ninja pkg-config wayland ];
nativeBuildInputs = [ cmake meson ninja pkg-config wayland ];
buildInputs = [
cairo libdrm libexecinfo libinput libjpeg libxkbcommon wayland
cairo doctest libdrm libexecinfo libinput libjpeg libxkbcommon wayland
wayland-protocols wf-config wlroots mesa
];
# CMake is just used for finding doctest.
dontUseCmakeConfigure = true;
mesonFlags = [ "--sysconfdir" "/etc" ];
meta = with lib; {

View file

@ -27569,8 +27569,7 @@ in
wayfireApplications = wayfireApplications-unwrapped.withPlugins (plugins: [ plugins.wf-shell ]);
inherit (wayfireApplications) wayfire wcm;
wayfireApplications-unwrapped = recurseIntoAttrs (
(callPackage ../applications/window-managers/wayfire/applications.nix { }).
extend (_: _: { wlroots = wlroots_0_13; })
callPackage ../applications/window-managers/wayfire/applications.nix { }
);
wayfirePlugins = recurseIntoAttrs (
callPackage ../applications/window-managers/wayfire/plugins.nix {