diff options
author | Michael Weiss <dev.primeos@gmail.com> | 2019-06-04 20:07:30 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-04 20:07:30 +0200 |
commit | aa0baea2c0c3c43186dba661729d4b60292be070 (patch) | |
tree | af0a48236a8b70ca87892907a6b5f789e44f5fe7 /pkgs/applications | |
parent | 5940f6b3f0681404a5b2f8dc2df34bfe254a288e (diff) | |
parent | e7be5691bab4a4637ab77a7b108b0eff374cef96 (diff) | |
download | nixlib-aa0baea2c0c3c43186dba661729d4b60292be070.tar nixlib-aa0baea2c0c3c43186dba661729d4b60292be070.tar.gz nixlib-aa0baea2c0c3c43186dba661729d4b60292be070.tar.bz2 nixlib-aa0baea2c0c3c43186dba661729d4b60292be070.tar.lz nixlib-aa0baea2c0c3c43186dba661729d4b60292be070.tar.xz nixlib-aa0baea2c0c3c43186dba661729d4b60292be070.tar.zst nixlib-aa0baea2c0c3c43186dba661729d4b60292be070.zip |
Merge pull request #62608 from Synthetica9/sway11
wlroots: 0.5 -> 0.6 sway: 1.0 -> 1.1.1
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/window-managers/sway/default.nix | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 3299811c4978..7d5c4c05131d 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -1,35 +1,28 @@ -{ stdenv, fetchFromGitHub, fetchpatch +{ stdenv, fetchFromGitHub, makeWrapper , meson, ninja , pkgconfig, scdoc , wayland, libxkbcommon, pcre, json_c, dbus, libevdev , pango, cairo, libinput, libcap, pam, gdk_pixbuf -, wlroots, wayland-protocols +, wlroots, wayland-protocols, swaybg }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "sway"; - version = "1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "swaywm"; repo = "sway"; rev = version; - sha256 = "09cndc2nl39d3l7g5634xp0pxcz60pvc5277mfw89r22mh0j78rx"; + sha256 = "0yhn9zdg9mzfhn97c440lk3pw6122nrhx0is5sqmvgr6p814f776"; }; 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"; - }) ./sway-config-no-nix-store-references.patch ./load-configuration-from-etc.patch ]; - nativeBuildInputs = [ pkgconfig meson ninja scdoc ]; + nativeBuildInputs = [ pkgconfig meson ninja scdoc makeWrapper ]; buildInputs = [ wayland libxkbcommon pcre json_c dbus libevdev @@ -44,6 +37,14 @@ stdenv.mkDerivation rec { "-Dtray=enabled" "-Dman-pages=enabled" ]; + postInstall = '' + wrapProgram $out/bin/sway --prefix PATH : "${swaybg}/bin" + ''; + + postPatch = '' + sed -i "s/version: '1.0'/version: '${version}'/" meson.build + ''; + meta = with stdenv.lib; { description = "i3-compatible tiling Wayland compositor"; homepage = https://swaywm.org; |