mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-17 07:13:23 +01:00
wayfire: 0.7.1 -> 0.7.2
This commit is contained in:
parent
203c8edcda
commit
738065bfc4
2 changed files with 10 additions and 8 deletions
|
@ -1,23 +1,26 @@
|
||||||
{ lib, stdenv, fetchurl, meson, ninja, pkg-config
|
{ lib, stdenv, fetchurl, cmake, meson, ninja, pkg-config
|
||||||
, cairo, libdrm, libexecinfo, libinput, libjpeg, libxkbcommon, wayland
|
, cairo, doctest, libdrm, libexecinfo, libinput, libjpeg, libxkbcommon, wayland
|
||||||
, wayland-protocols, wf-config, wlroots, mesa
|
, wayland-protocols, wf-config, wlroots, mesa
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "wayfire";
|
pname = "wayfire";
|
||||||
version = "0.7.1";
|
version = "0.7.2";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/WayfireWM/wayfire/releases/download/v${version}/wayfire-${version}.tar.xz";
|
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 = [
|
buildInputs = [
|
||||||
cairo libdrm libexecinfo libinput libjpeg libxkbcommon wayland
|
cairo doctest libdrm libexecinfo libinput libjpeg libxkbcommon wayland
|
||||||
wayland-protocols wf-config wlroots mesa
|
wayland-protocols wf-config wlroots mesa
|
||||||
];
|
];
|
||||||
|
|
||||||
|
# CMake is just used for finding doctest.
|
||||||
|
dontUseCmakeConfigure = true;
|
||||||
|
|
||||||
mesonFlags = [ "--sysconfdir" "/etc" ];
|
mesonFlags = [ "--sysconfdir" "/etc" ];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
|
|
@ -27569,8 +27569,7 @@ in
|
||||||
wayfireApplications = wayfireApplications-unwrapped.withPlugins (plugins: [ plugins.wf-shell ]);
|
wayfireApplications = wayfireApplications-unwrapped.withPlugins (plugins: [ plugins.wf-shell ]);
|
||||||
inherit (wayfireApplications) wayfire wcm;
|
inherit (wayfireApplications) wayfire wcm;
|
||||||
wayfireApplications-unwrapped = recurseIntoAttrs (
|
wayfireApplications-unwrapped = recurseIntoAttrs (
|
||||||
(callPackage ../applications/window-managers/wayfire/applications.nix { }).
|
callPackage ../applications/window-managers/wayfire/applications.nix { }
|
||||||
extend (_: _: { wlroots = wlroots_0_13; })
|
|
||||||
);
|
);
|
||||||
wayfirePlugins = recurseIntoAttrs (
|
wayfirePlugins = recurseIntoAttrs (
|
||||||
callPackage ../applications/window-managers/wayfire/plugins.nix {
|
callPackage ../applications/window-managers/wayfire/plugins.nix {
|
||||||
|
|
Loading…
Reference in a new issue