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

sway: Switch to 1.0

Browse Source 
This is the result of executing:
git mv -f pkgs/applications/window-managers/sway/beta.nix pkgs/applications/window-managers/sway/default.nix
git mv -f nixos/modules/programs/sway-beta.nix nixos/modules/programs/sway.nix

And removing sway-beta from the following files:
pkgs/top-level/all-packages.nix
nixos/modules/module-list.nix
This commit is contained in:
Michael Weiss
2019-03-12 22:29:39 +01:00
parent 24c02a0f5d
commit 45004c6f63
6 changed files with 59 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/window-managers/sway/default.nix
+29 -15
View File
@@ -1,40 +1,54 @@
{ stdenv, fetchFromGitHub
, cmake, pkgconfig, asciidoc, libxslt, docbook_xsl
, wayland, wlc, libxkbcommon, pcre, json_c, dbus
, pango, cairo, libinput, libcap, pam, gdk_pixbuf, libpthreadstubs
, libXdmcp
{ stdenv, fetchFromGitHub, fetchpatch
, meson, ninja
, pkgconfig, scdoc
, wayland, libxkbcommon, pcre, json_c, dbus, libevdev
, pango, cairo, libinput, libcap, pam, gdk_pixbuf
, wlroots, wayland-protocols
, buildDocs ? true
}:
stdenv.mkDerivation rec {
name = "sway-${version}";
version = "0.15.2";
name = "${pname}-${version}";
pname = "sway";
version = "1.0";
src = fetchFromGitHub {
owner = "swaywm";
repo = "sway";
rev = version;
sha256 = "1p9j5gv85lsgj4z28qja07dqyvqk41w6mlaflvvm9yxafx477g5n";
sha256 = "09cndc2nl39d3l7g5634xp0pxcz60pvc5277mfw89r22mh0j78rx";
};
patches = [
# Fix for a compiler warning that causes a build failure
# (see https://github.com/swaywm/sway/issues/3862):
(fetchpatch {
url = "https://github.com/swaywm/sway/commit/bcde298a719f60b9913133dbd2a169dedbc8dd7d.patch";
sha256 = "0r583nmqvq43ib93yv6flw8pj833v32lbs0q0xld56s3rnzvvdcp";
})
];
nativeBuildInputs = [
cmake pkgconfig
] ++ stdenv.lib.optional buildDocs [ asciidoc libxslt docbook_xsl ];
pkgconfig meson ninja
] ++ stdenv.lib.optional buildDocs scdoc;
buildInputs = [
wayland wlc libxkbcommon pcre json_c dbus
pango cairo libinput libcap pam gdk_pixbuf libpthreadstubs
libXdmcp
wayland libxkbcommon pcre json_c dbus libevdev
pango cairo libinput libcap pam gdk_pixbuf
wlroots wayland-protocols
];
enableParallelBuilding = true;
cmakeFlags = "-DVERSION=${version} -DLD_LIBRARY_PATH=/run/opengl-driver/lib:/run/opengl-driver-32/lib";
mesonFlags = [
"-Dxwayland=enabled" "-Dgdk-pixbuf=enabled" "-Dtray=enabled"
] ++ stdenv.lib.optional buildDocs "-Dman-pages=enabled";
meta = with stdenv.lib; {
description = "i3-compatible window manager for Wayland";
homepage = https://swaywm.org;
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ primeos ]; # Trying to keep it up-to-date.
maintainers = with maintainers; [ primeos synthetica ];
};
}