From 738065bfc4d79ebadaef850531953368cdaa1ba6 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 24 Jun 2021 15:13:35 +0000 Subject: [PATCH] wayfire: 0.7.1 -> 0.7.2 --- .../window-managers/wayfire/default.nix | 15 +++++++++------ pkgs/top-level/all-packages.nix | 3 +-- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/window-managers/wayfire/default.nix b/pkgs/applications/window-managers/wayfire/default.nix index 38f082b8505..120ff6cf697 100644 --- a/pkgs/applications/window-managers/wayfire/default.nix +++ b/pkgs/applications/window-managers/wayfire/default.nix @@ -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; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac5dc382762..33d7c26c24c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 {