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

Merge branch 'master' into staging-next

Browse Source
This commit is contained in:
Jan Tojnar
2021-03-18 13:35:59 +01:00
parent c31077a602 de4012ac80
commit 0136206b12
206 changed files with 3936 additions and 1371 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/window-managers/wayfire/wcm.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, meson, ninja, pkg-config, wayland, wrapGAppsHook
, gnome3, libevdev, libxml2, wayfire, wayland-protocols, wf-config, wf-shell
, gtk3, libevdev, libxml2, wayfire, wayland-protocols, wf-config, wf-shell
}:
stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja pkg-config wayland wrapGAppsHook ];
buildInputs = [
gnome3.gtk libevdev libxml2 wayfire wayland
gtk3 libevdev libxml2 wayfire wayland
wayland-protocols wf-config wf-shell
];
pkgs/applications/window-managers/wayfire/wf-shell.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, meson, ninja, pkg-config, wayland, git
, alsaLib, gnome3, gtk-layer-shell, pulseaudio, wayfire, wf-config
, alsaLib, gtkmm3, gtk-layer-shell, pulseaudio, wayfire, wf-config
}:
stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja pkg-config wayland ];
buildInputs = [
alsaLib gnome3.gtkmm gtk-layer-shell pulseaudio wayfire wf-config
alsaLib gtkmm3 gtk-layer-shell pulseaudio wayfire wf-config
];
mesonFlags = [ "--sysconfdir" "/etc" ];