ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-19 02:44:17 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #203221 from primeos/sway

Browse Source 
sway: 1.7 -> 1.8
This commit is contained in:
Michael Weiss 2022-12-26 23:37:19 +01:00 committed by GitHub
commit 7f8750b1fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/applications/window-managers/sway/default.nix
View File

@ -1,13 +1,13 @@
{ lib, stdenv, fetchFromGitHub, substituteAll, swaybg { lib, stdenv, fetchFromGitHub, substituteAll, swaybg
, meson, ninja, pkg-config, wayland-scanner, scdoc , meson, ninja, pkg-config, wayland-scanner, scdoc
, wayland, libxkbcommon, pcre, json_c, libevdev , wayland, libxkbcommon, pcre2, json_c, libevdev
, pango, cairo, libinput, libcap, pam, gdk-pixbuf, librsvg , pango, cairo, libinput, libcap, pam, gdk-pixbuf, librsvg
, wlroots, wayland-protocols, libdrm , wlroots_0_16, wayland-protocols, libdrm
, nixosTests , nixosTests
# Used by the NixOS module: # Used by the NixOS module:
, isNixOS ? false , isNixOS ? false
, enableXWayland ? true , enableXWayland ? true, xorg
, systemdSupport ? stdenv.isLinux , systemdSupport ? stdenv.isLinux
, dbusSupport ? true , dbusSupport ? true
, dbus , dbus
@ -23,13 +23,13 @@ let sd-bus-provider = if systemdSupport then "libsystemd" else "basu"; in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "sway-unwrapped"; pname = "sway-unwrapped";
version = "1.7"; version = "1.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "swaywm"; owner = "swaywm";
repo = "sway"; repo = "sway";
rev = version; rev = version;
sha256 = "0ss3l258blyf2d0lwd7pi7ga1fxfj8pxhag058k7cmjhs3y30y5l"; hash = "sha256-r5qf50YK0Wl0gFiFdSE/J6ZU+D/Cz32u1mKzOqnIuJ0=";
}; };
patches = [ patches = [
@ -59,12 +59,14 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
wayland libxkbcommon pcre json_c libevdev wayland libxkbcommon pcre2 json_c libevdev
pango cairo libinput libcap pam gdk-pixbuf librsvg pango cairo libinput libcap pam gdk-pixbuf librsvg
wayland-protocols libdrm wayland-protocols libdrm
(wlroots.override { inherit enableXWayland; }) (wlroots_0_16.override { inherit enableXWayland; })
] ++ lib.optionals dbusSupport [ ] ++ lib.optionals dbusSupport [
dbus dbus
] ++ lib.optionals enableXWayland [
xorg.xcbutilwm
]; ];
mesonFlags = mesonFlags =