diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 8de87d2e8fd6..6227ccd2c9fa 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -1,8 +1,9 @@ { stdenv, fetchFromGitHub -, makeWrapper, cmake, pkgconfig, asciidoc, libxslt, docbook_xsl -, wayland, wlc, libxkbcommon, pixman, fontconfig, pcre, json_c, dbus_libs -, pango, cairo, libinput, libcap, xwayland, pam, gdk_pixbuf, libpthreadstubs +, cmake, pkgconfig, asciidoc, libxslt, docbook_xsl +, wayland, wlc, libxkbcommon, pcre, json_c, dbus_libs +, pango, cairo, libinput, libcap, pam, gdk_pixbuf, libpthreadstubs , libXdmcp +, buildDocs ? true }: stdenv.mkDerivation rec { @@ -17,28 +18,17 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - makeWrapper cmake pkgconfig - asciidoc libxslt docbook_xsl - ]; + cmake pkgconfig + ] ++ stdenv.lib.optional buildDocs [ asciidoc libxslt docbook_xsl ]; buildInputs = [ - wayland wlc libxkbcommon pixman fontconfig pcre json_c dbus_libs - pango cairo libinput libcap xwayland pam gdk_pixbuf libpthreadstubs + wayland wlc libxkbcommon pcre json_c dbus_libs + pango cairo libinput libcap pam gdk_pixbuf libpthreadstubs libXdmcp ]; - patchPhase = '' - sed -i s@/etc/sway@$out/etc/sway@g CMakeLists.txt; - ''; + enableParallelBuilding = true; - makeFlags = "PREFIX=$(out)"; cmakeFlags = "-DVERSION=${version}"; - installPhase = "PREFIX=$out make install"; - - LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ wlc dbus_libs ]; - preFixup = '' - wrapProgram $out/bin/sway \ - --prefix LD_LIBRARY_PATH : "${LD_LIBRARY_PATH}"; - ''; meta = with stdenv.lib; { description = "i3-compatible window manager for Wayland";