From 19fda989f3e973563c78705ad46f49e892326757 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 8 Nov 2020 16:19:21 +0100 Subject: [PATCH 1/2] wlroots: 0.11.0 -> 0.12.0 The libseat session backend [0] will be disabled for now since NixOS depends on systemd anyway (so we can use logind). But if someone wants/requires libseat [1] and would maintain it in Nixpkgs we could enable it. [0]: https://github.com/swaywm/wlroots/pull/2364 [1]: https://sr.ht/~kennylevinsen/seatd/ --- pkgs/development/libraries/wlroots/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 67faad8cd74f..13132c8cc1c9 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.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "swaywm"; repo = "wlroots"; rev = version; - sha256 = "08d5d52m8wy3imfc6mdxpx8swhh2k4s1gmfaykg02j59z84awc6p"; + sha256 = "01j38lmgs2c6fq68v8b75pkilia2wsgzgp46ivfbi9hhx47kgcfn"; }; # $out for the library and $examples for the example programs (in examples): @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { libpng ffmpeg ]; - mesonFlags = [ "-Dlogind-provider=systemd" ]; + mesonFlags = [ "-Dlogind-provider=systemd" "-Dlibseat=disabled" ]; postFixup = '' # Install ALL example programs to $examples: From db6b85391fee03650b9ea937e64f8b4bfa1b0361 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 8 Nov 2020 16:50:11 +0100 Subject: [PATCH 2/2] sway: Fix the build with wlroots 0.12.0 Sway 1.5 isn't affected by the breaking changes of wlroots 0.12.0 so we can simply relax the version requirement. --- pkgs/applications/window-managers/sway/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index da58d844ee89..0af46db0a1c2 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -22,7 +22,9 @@ stdenv.mkDerivation rec { ]; postPatch = '' - substituteInPlace meson.build --replace "v1.5" "1.5" + substituteInPlace meson.build \ + --replace "v1.5" "1.5" \ + --replace "wlroots_version = ['>=0.11.0', '<0.12.0']" "wlroots_version = ['>=0.11.0', '<0.13.0']" ''; nativeBuildInputs = [