public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #27291 from celldee/sway_0_13_0

Browse Source 
sway: 0.12.2 -> 0.13.0
This commit is contained in:
Jörg Thalheim 2017-07-12 21:23:18 +01:00 committed by GitHub
commit 9e72b32579
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/window-managers/sway/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchFromGitHub, pango, libinput { stdenv, fetchFromGitHub, pango, libinput
, makeWrapper, cmake, pkgconfig, asciidoc, libxslt, docbook_xsl, cairo , makeWrapper, cmake, pkgconfig, asciidoc, libxslt, docbook_xsl, cairo
, wayland, wlc, libxkbcommon, pixman, fontconfig, pcre, json_c, dbus_libs, libcap , wayland, wlc, libxkbcommon, pixman, fontconfig, pcre, json_c, dbus_libs, libcap
, xwayland , xwayland, pam, gdk_pixbuf
}: }:
let let
version = "0.12.2"; version = "0.13.0";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "sway-${version}"; name = "sway-${version}";
@ -14,18 +14,19 @@ in
owner = "Sircmpwn"; owner = "Sircmpwn";
repo = "sway"; repo = "sway";
rev = "${version}"; rev = "${version}";
sha256 = "1hkr6pmz45xa5w5y21ijz7i2dwb62rifhcy28r8kh5r2hwbil2hs"; sha256 = "1vgk4rl51nx66yzpwg4yhnbj7wc30k5q0hh5lf8y0i1nvpal0p3q";
}; };
nativeBuildInputs = [ makeWrapper cmake pkgconfig asciidoc libxslt docbook_xsl ]; 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 = '' patchPhase = ''
sed -i s@/etc/sway@$out/etc/sway@g CMakeLists.txt; sed -i s@/etc/sway@$out/etc/sway@g CMakeLists.txt;
''; '';
makeFlags = "PREFIX=$(out)"; makeFlags = "PREFIX=$(out)";
cmakeFlags = "-DVERSION=${version}";
installPhase = "PREFIX=$out make install"; installPhase = "PREFIX=$out make install";
LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ wlc dbus_libs ]; LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ wlc dbus_libs ];