diff options
| author | gnidorah <gnidorah@users.noreply.github.com> | 2017-10-24 18:43:19 +0300 |
|---|---|---|
| committer | gnidorah <gnidorah@users.noreply.github.com> | 2017-10-25 21:51:52 +0300 |
| commit | 8cfbf2be5b74f40dbf88008d3acfbc8789c3ad36 (patch) | |
| tree | 41728fb9d9515b086e254e789933508bd8dbb82a /pkgs/applications | |
| parent | c7285c33424338f7ea080ad3c4991eecfd46fd58 (diff) | |
| download | nixlib-8cfbf2be5b74f40dbf88008d3acfbc8789c3ad36.tar nixlib-8cfbf2be5b74f40dbf88008d3acfbc8789c3ad36.tar.gz nixlib-8cfbf2be5b74f40dbf88008d3acfbc8789c3ad36.tar.bz2 nixlib-8cfbf2be5b74f40dbf88008d3acfbc8789c3ad36.tar.lz nixlib-8cfbf2be5b74f40dbf88008d3acfbc8789c3ad36.tar.xz nixlib-8cfbf2be5b74f40dbf88008d3acfbc8789c3ad36.tar.zst nixlib-8cfbf2be5b74f40dbf88008d3acfbc8789c3ad36.zip | |
sway: cleanup
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/window-managers/sway/default.nix | 28 |
1 files changed, 9 insertions, 19 deletions
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"; |