public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot]
2021-04-29 12:26:05 +00:00
committed by GitHub
parent 1e556b436e 2162d459fe
commit 54e69b71cd
34 changed files with 527 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/window-managers/wayfire/default.nix
+3 -3
View File
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "wayfire";
version = "0.7.0";
version = "0.7.1";
src = fetchurl {
url = "https://github.com/WayfireWM/wayfire/releases/download/v${version}/wayfire-${version}.tar.xz";
sha256 = "19k9nk5whql03ik66i06r4xgxk5v7mpdphjpv13hdw8ba48w73hd";
sha256 = "0wgvwbmdhn7gkdr2jl9jndgvl6w4x7ys8gmpj55gqh9b57wqhyaq";
};
nativeBuildInputs = [ meson ninja pkg-config wayland ];
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://wayfire.org/";
description = "3D wayland compositor";
description = "3D Wayland compositor";
license = licenses.mit;
maintainers = with maintainers; [ qyliss wucke13 ];
platforms = platforms.unix;
pkgs/applications/window-managers/wayfire/wf-config.nix
+12 -5
View File
@@ -1,18 +1,25 @@
{ stdenv, lib, fetchurl, meson, ninja, pkg-config, glm, libevdev, libxml2 }:
{ stdenv, lib, fetchurl, cmake, meson, ninja, pkg-config
, doctest, glm, libevdev, libxml2
}:
stdenv.mkDerivation rec {
pname = "wf-config";
version = "0.7.0";
version = "0.7.1";
src = fetchurl {
url = "https://github.com/WayfireWM/wf-config/releases/download/v${version}/wf-config-${version}.tar.xz";
sha256 = "1bas5gsbnf8jxkkxd95992chz8yk5ckgg7r09gfnmm7xi8w0pyy7";
sha256 = "1w75yxhz0nvw4mlv38sxp8k8wb5h99b51x3fdvizc3yaxanqa8kx";
};
nativeBuildInputs = [ meson ninja pkg-config ];
buildInputs = [ libevdev libxml2 ];
nativeBuildInputs = [ cmake meson ninja pkg-config ];
buildInputs = [ doctest libevdev libxml2 ];
propagatedBuildInputs = [ glm ];
# CMake is just used for finding doctest.
dontUseCmakeConfigure = true;
doCheck = true;
meta = with lib; {
homepage = "https://github.com/WayfireWM/wf-config";
description = "Library for managing configuration files, written for Wayfire";