From 7acd1e7f68bb6c7d3032fa287c46c238806ac163 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 4 Apr 2017 20:56:27 -0400 Subject: [PATCH 1/2] sway: 0.11 -> 0.12.2 --- pkgs/applications/window-managers/sway/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 79077b477b4..64899e555c7 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -4,7 +4,7 @@ }: let - version = "0.11"; + version = "0.12.2"; in stdenv.mkDerivation rec { name = "sway-${version}"; @@ -13,7 +13,7 @@ in owner = "Sircmpwn"; repo = "sway"; rev = "${version}"; - sha256 = "01k01f72kh90fwgqh2hgg6dv9931x4v18bzz11b47mn7p9z68ddv"; + sha256 = "1hkr6pmz45xa5w5y21ijz7i2dwb62rifhcy28r8kh5r2hwbil2hs"; }; nativeBuildInputs = [ makeWrapper cmake pkgconfig asciidoc libxslt docbook_xsl ]; From f911770acfaa6fd5a18e5236335ec7e2d3f34793 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 5 Apr 2017 08:17:49 -0400 Subject: [PATCH 2/2] sway: Add xwayland build input --- pkgs/applications/window-managers/sway/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 64899e555c7..f392945b36d 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchFromGitHub, pango, libinput , makeWrapper, cmake, pkgconfig, asciidoc, libxslt, docbook_xsl, cairo , wayland, wlc, libxkbcommon, pixman, fontconfig, pcre, json_c, dbus_libs, libcap +, xwayland }: let @@ -18,7 +19,7 @@ in nativeBuildInputs = [ makeWrapper cmake pkgconfig asciidoc libxslt docbook_xsl ]; - buildInputs = [ wayland wlc libxkbcommon pixman fontconfig pcre json_c dbus_libs pango cairo libinput libcap ]; + buildInputs = [ wayland wlc libxkbcommon pixman fontconfig pcre json_c dbus_libs pango cairo libinput libcap xwayland ]; patchPhase = '' sed -i s@/etc/sway@$out/etc/sway@g CMakeLists.txt;