From f73a8b22fbed2193edcc97884f6ddbc167ebe7c4 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 3 Feb 2019 11:57:19 +0100 Subject: [PATCH] sway-beta: 1.0-beta.2 -> 1.0-rc1 --- pkgs/applications/window-managers/sway/beta.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/window-managers/sway/beta.nix b/pkgs/applications/window-managers/sway/beta.nix index fd3e2275b442..8b2acc94ea08 100644 --- a/pkgs/applications/window-managers/sway/beta.nix +++ b/pkgs/applications/window-managers/sway/beta.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub , meson, ninja , pkgconfig, scdoc -, wayland, libxkbcommon, pcre, json_c, dbus +, wayland, libxkbcommon, pcre, json_c, dbus, libevdev , pango, cairo, libinput, libcap, pam, gdk_pixbuf , wlroots, wayland-protocols , buildDocs ? true @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "sway"; - version = "1.0-beta.2"; + version = "1.0-rc1"; src = fetchFromGitHub { owner = "swaywm"; repo = "sway"; rev = version; - sha256 = "0f9rniwizbc3vzxdy6rc47749p6gczfbgfdy4r458134rbl551hw"; + sha256 = "1zigx2yz0i91iz2r2l6csq33hscaybmaq1p19jgxrazms7z213mz"; }; nativeBuildInputs = [ @@ -24,14 +24,17 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional buildDocs scdoc; buildInputs = [ - wayland libxkbcommon pcre json_c dbus + wayland libxkbcommon pcre json_c dbus libevdev pango cairo libinput libcap pam gdk_pixbuf wlroots wayland-protocols ]; enableParallelBuilding = true; - mesonFlags = "-Dsway-version=${version}"; + mesonFlags = [ + "-Dsway-version=${version}" "-Dxwayland=enabled" "-Dgdk-pixbuf=enabled" + "-Dman-pages=enabled" "-Dtray=enabled" + ]; meta = with stdenv.lib; { description = "i3-compatible window manager for Wayland";