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

sway: 1.4 -> 1.5

Browse Source
This commit is contained in:
Michael Weiss 2020-06-24 20:50:43 +02:00
parent 369dcb9202
commit f1dd43404a
No known key found for this signature in database
GPG Key ID: 5BE487C4D4771D83
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,20 +1,19 @@
{ stdenv, fetchFromGitHub, makeWrapper { stdenv, fetchFromGitHub, makeWrapper
, meson, ninja , meson, ninja, pkg-config, wayland, scdoc
, pkgconfig, scdoc , libxkbcommon, pcre, json_c, dbus, libevdev
, wayland, libxkbcommon, pcre, json_c, dbus, libevdev
, pango, cairo, libinput, libcap, pam, gdk-pixbuf, librsvg , pango, cairo, libinput, libcap, pam, gdk-pixbuf, librsvg
, wlroots, wayland-protocols , wlroots, wayland-protocols
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "sway-unwrapped"; pname = "sway-unwrapped";
version = "1.4"; version = "1.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "swaywm"; owner = "swaywm";
repo = "sway"; repo = "sway";
rev = version; rev = version;
sha256 = "11qf89y3q92g696a6f4d23qb44gqixg6qxq740vwv2jw59ms34ja"; sha256 = "0r3b7h778l9i20z3him9i2qsaynpn9y78hzfgv3cqi8fyry2c4f9";
}; };
patches = [ patches = [
@ -22,8 +21,12 @@ stdenv.mkDerivation rec {
./load-configuration-from-etc.patch ./load-configuration-from-etc.patch
]; ];
postPatch = ''
substituteInPlace meson.build --replace "v1.5" "1.5"
'';
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig meson ninja scdoc meson ninja pkg-config wayland scdoc
]; ];
buildInputs = [ buildInputs = [
@ -32,16 +35,23 @@ stdenv.mkDerivation rec {
wlroots wayland-protocols wlroots wayland-protocols
]; ];
enableParallelBuilding = true;
mesonFlags = [ mesonFlags = [
"-Ddefault-wallpaper=false" "-Dxwayland=enabled" "-Dgdk-pixbuf=enabled" "-Ddefault-wallpaper=false"
"-Dtray=enabled" "-Dman-pages=enabled"
]; ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "i3-compatible tiling Wayland compositor"; description = "An i3-compatible tiling Wayland compositor";
longDescription = ''
Sway is a tiling Wayland compositor and a drop-in replacement for the i3
window manager for X11. It works with your existing i3 configuration and
supports most of i3's features, plus a few extras.
Sway allows you to arrange your application windows logically, rather
than spatially. Windows are arranged into a grid by default which
maximizes the efficiency of your screen and can be quickly manipulated
using only the keyboard.
'';
homepage = "https://swaywm.org"; homepage = "https://swaywm.org";
changelog = "https://github.com/swaywm/sway/releases/tag/${version}";
license = licenses.mit; license = licenses.mit;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ primeos synthetica ma27 ]; maintainers = with maintainers; [ primeos synthetica ma27 ];