alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases 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
parent f2a15bc22f 9896c88303
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
, 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
, wlroots, wayland-protocols, libdrm
, wlroots_0_16, wayland-protocols, libdrm
, nixosTests
# Used by the NixOS module:
, isNixOS ? false
, enableXWayland ? true
, enableXWayland ? true, xorg
, systemdSupport ? stdenv.isLinux
, dbusSupport ? true
, dbus
@ -23,13 +23,13 @@ let sd-bus-provider = if systemdSupport then "libsystemd" else "basu"; in
stdenv.mkDerivation rec {
pname = "sway-unwrapped";
version = "1.7";
version = "1.8";
src = fetchFromGitHub {
owner = "swaywm";
repo = "sway";
rev = version;
sha256 = "0ss3l258blyf2d0lwd7pi7ga1fxfj8pxhag058k7cmjhs3y30y5l";
hash = "sha256-r5qf50YK0Wl0gFiFdSE/J6ZU+D/Cz32u1mKzOqnIuJ0=";
};
patches = [
@ -59,12 +59,14 @@ stdenv.mkDerivation rec {
];
buildInputs = [
wayland libxkbcommon pcre json_c libevdev
wayland libxkbcommon pcre2 json_c libevdev
pango cairo libinput libcap pam gdk-pixbuf librsvg
wayland-protocols libdrm
(wlroots.override { inherit enableXWayland; })
(wlroots_0_16.override { inherit enableXWayland; })
] ++ lib.optionals dbusSupport [
dbus
] ++ lib.optionals enableXWayland [
xorg.xcbutilwm
];
mesonFlags =