From 369dcb9202eeb0c8153e89145ecfc618ca327f30 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 24 Jun 2020 20:57:00 +0200 Subject: [PATCH 1/3] wlroots: 0.10.1 -> 0.11.0 --- pkgs/development/libraries/wlroots/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 33db6e9d75b..46a1fc45d81 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "wlroots"; - version = "0.10.1"; + version = "0.11.0"; src = fetchFromGitHub { owner = "swaywm"; repo = "wlroots"; rev = version; - sha256 = "0j2lh9vc92zhn44rjbia5aw3y1rpgfng1x1h17lcvj5m4i6vj0pc"; + sha256 = "08d5d52m8wy3imfc6mdxpx8swhh2k4s1gmfaykg02j59z84awc6p"; }; # $out for the library and $examples for the example programs (in examples): @@ -21,11 +21,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkg-config wayland ]; buildInputs = [ - libGL wayland-protocols libinput libxkbcommon pixman + libGL wayland wayland-protocols libinput libxkbcommon pixman xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa libpng ffmpeg ]; + mesonFlags = [ "-Dlogind-provider=systemd" ]; + postInstall = '' # Copy the library to $examples mkdir -p $examples/lib From f1dd43404ad2addf0cf3b34f4195a0aa08449137 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 24 Jun 2020 20:50:43 +0200 Subject: [PATCH 2/3] sway: 1.4 -> 1.5 --- .../window-managers/sway/default.nix | 32 ++++++++++++------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 66681ef0850..da58d844ee8 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -1,20 +1,19 @@ { stdenv, fetchFromGitHub, makeWrapper -, meson, ninja -, pkgconfig, scdoc -, wayland, libxkbcommon, pcre, json_c, dbus, libevdev +, meson, ninja, pkg-config, wayland, scdoc +, libxkbcommon, pcre, json_c, dbus, libevdev , pango, cairo, libinput, libcap, pam, gdk-pixbuf, librsvg , wlroots, wayland-protocols }: stdenv.mkDerivation rec { pname = "sway-unwrapped"; - version = "1.4"; + version = "1.5"; src = fetchFromGitHub { owner = "swaywm"; repo = "sway"; rev = version; - sha256 = "11qf89y3q92g696a6f4d23qb44gqixg6qxq740vwv2jw59ms34ja"; + sha256 = "0r3b7h778l9i20z3him9i2qsaynpn9y78hzfgv3cqi8fyry2c4f9"; }; patches = [ @@ -22,8 +21,12 @@ stdenv.mkDerivation rec { ./load-configuration-from-etc.patch ]; + postPatch = '' + substituteInPlace meson.build --replace "v1.5" "1.5" + ''; + nativeBuildInputs = [ - pkgconfig meson ninja scdoc + meson ninja pkg-config wayland scdoc ]; buildInputs = [ @@ -32,16 +35,23 @@ stdenv.mkDerivation rec { wlroots wayland-protocols ]; - enableParallelBuilding = true; - mesonFlags = [ - "-Ddefault-wallpaper=false" "-Dxwayland=enabled" "-Dgdk-pixbuf=enabled" - "-Dtray=enabled" "-Dman-pages=enabled" + "-Ddefault-wallpaper=false" ]; 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"; + changelog = "https://github.com/swaywm/sway/releases/tag/${version}"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ primeos synthetica ma27 ]; From 81a214e62c52e77110010f7eff5084a45d42706b Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 25 Jun 2020 14:59:25 +0200 Subject: [PATCH 3/3] sway-contrib.grimshot: Reuse sway-unwrapped.src --- .../window-managers/sway/contrib.nix | 20 ++++--------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/window-managers/sway/contrib.nix b/pkgs/applications/window-managers/sway/contrib.nix index e2c27fb470f..fd44f4a5be5 100644 --- a/pkgs/applications/window-managers/sway/contrib.nix +++ b/pkgs/applications/window-managers/sway/contrib.nix @@ -18,23 +18,11 @@ grimshot = stdenv.mkDerivation rec { pname = "grimshot"; - version = "2020-05-08"; - rev = "b1d08db5f5112ab562f89564825e3e791b0682c4"; + version = sway-unwrapped.version; - # master has new fixes and features, and a man page - # after sway-1.5 these may be switched to sway-unwrapped.src - bsrc = fetchurl { - url = "https://raw.githubusercontent.com/swaywm/sway/${rev}/contrib/grimshot"; - sha256 = "1awzmzkib8a7q5s78xyh8za03lplqfpbasqp3lidqqmjqs882jq9"; - }; - - msrc = fetchurl { - url = "https://raw.githubusercontent.com/swaywm/sway/${rev}/contrib/grimshot.1"; - sha256 = "191xxjfhf61gkxl3b0f694h0nrwd7vfnyp5afk8snhhr6q7ia4jz"; - }; + src = sway-unwrapped.src; dontBuild = true; - dontUnpack = true; dontConfigure = true; outputs = [ "out" "man" ]; @@ -42,9 +30,9 @@ grimshot = stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper installShellFiles ]; installPhase = '' - installManPage ${msrc} + installManPage contrib/grimshot.1 - install -Dm 0755 ${bsrc} $out/bin/grimshot + install -Dm 0755 contrib/grimshot $out/bin/grimshot wrapProgram $out/bin/grimshot --set PATH \ "${stdenv.lib.makeBinPath [ sway-unwrapped