From 82ddeaba8824cca0213ef7548c153af2449eafc8 Mon Sep 17 00:00:00 2001 From: Chris Duncan Date: Mon, 10 Jul 2017 21:54:03 +0100 Subject: [PATCH 1/3] sway: Add pam, gdk_pixbuf build inputs --- 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 f392945b36d..7f08ce3686e 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -1,7 +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 +, xwayland, pam, gdk_pixbuf }: let @@ -19,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 xwayland ]; + buildInputs = [ wayland wlc libxkbcommon pixman fontconfig pcre json_c dbus_libs pango cairo libinput libcap xwayland pam gdk_pixbuf ]; patchPhase = '' sed -i s@/etc/sway@$out/etc/sway@g CMakeLists.txt; From c27ebd41c55f78c1f861959283bd04f6fcb27b4e Mon Sep 17 00:00:00 2001 From: Chris Duncan Date: Mon, 10 Jul 2017 21:56:36 +0100 Subject: [PATCH 2/3] sway: Add cmake version number flag --- pkgs/applications/window-managers/sway/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 7f08ce3686e..1299540e5ee 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -26,6 +26,7 @@ in ''; makeFlags = "PREFIX=$(out)"; + cmakeFlags = "-DVERSION=${version}"; installPhase = "PREFIX=$out make install"; LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ wlc dbus_libs ]; From cca84bc6c9430db748168dc8344cf5598c4ee8c9 Mon Sep 17 00:00:00 2001 From: Chris Duncan Date: Mon, 10 Jul 2017 22:00:22 +0100 Subject: [PATCH 3/3] sway: 0.12.2 -> 0.13.0 --- 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 1299540e5ee..ac725733d64 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -5,7 +5,7 @@ }: let - version = "0.12.2"; + version = "0.13.0"; in stdenv.mkDerivation rec { name = "sway-${version}"; @@ -14,7 +14,7 @@ in owner = "Sircmpwn"; repo = "sway"; rev = "${version}"; - sha256 = "1hkr6pmz45xa5w5y21ijz7i2dwb62rifhcy28r8kh5r2hwbil2hs"; + sha256 = "1vgk4rl51nx66yzpwg4yhnbj7wc30k5q0hh5lf8y0i1nvpal0p3q"; }; nativeBuildInputs = [ makeWrapper cmake pkgconfig asciidoc libxslt docbook_xsl ];