wayfire: 0.7.1 -> 0.7.2

authored by

Alyssa Ross and committed by
Michael Weiss
738065bf 203c8edc

+10 -8
+9 -6
pkgs/applications/window-managers/wayfire/default.nix
··· 1 - { lib, stdenv, fetchurl, meson, ninja, pkg-config 2 - , cairo, libdrm, libexecinfo, libinput, libjpeg, libxkbcommon, wayland 1 + { lib, stdenv, fetchurl, cmake, meson, ninja, pkg-config 2 + , cairo, doctest, libdrm, libexecinfo, libinput, libjpeg, libxkbcommon, wayland 3 3 , wayland-protocols, wf-config, wlroots, mesa 4 4 }: 5 5 6 6 stdenv.mkDerivation rec { 7 7 pname = "wayfire"; 8 - version = "0.7.1"; 8 + version = "0.7.2"; 9 9 10 10 src = fetchurl { 11 11 url = "https://github.com/WayfireWM/wayfire/releases/download/v${version}/wayfire-${version}.tar.xz"; 12 - sha256 = "0wgvwbmdhn7gkdr2jl9jndgvl6w4x7ys8gmpj55gqh9b57wqhyaq"; 12 + sha256 = "1gasijjyfl00zpy6j9hh6qpwv0sw42h9irycbnm693j3vw9mcy66"; 13 13 }; 14 14 15 - nativeBuildInputs = [ meson ninja pkg-config wayland ]; 15 + nativeBuildInputs = [ cmake meson ninja pkg-config wayland ]; 16 16 buildInputs = [ 17 - cairo libdrm libexecinfo libinput libjpeg libxkbcommon wayland 17 + cairo doctest libdrm libexecinfo libinput libjpeg libxkbcommon wayland 18 18 wayland-protocols wf-config wlroots mesa 19 19 ]; 20 + 21 + # CMake is just used for finding doctest. 22 + dontUseCmakeConfigure = true; 20 23 21 24 mesonFlags = [ "--sysconfdir" "/etc" ]; 22 25
+1 -2
pkgs/top-level/all-packages.nix
··· 27569 27569 wayfireApplications = wayfireApplications-unwrapped.withPlugins (plugins: [ plugins.wf-shell ]); 27570 27570 inherit (wayfireApplications) wayfire wcm; 27571 27571 wayfireApplications-unwrapped = recurseIntoAttrs ( 27572 - (callPackage ../applications/window-managers/wayfire/applications.nix { }). 27573 - extend (_: _: { wlroots = wlroots_0_13; }) 27572 + callPackage ../applications/window-managers/wayfire/applications.nix { } 27574 27573 ); 27575 27574 wayfirePlugins = recurseIntoAttrs ( 27576 27575 callPackage ../applications/window-managers/wayfire/plugins.nix {