From 99d623850f56975f026a56b96be0f79db1ba00f7 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 30 Nov 2018 14:23:33 +0100 Subject: [PATCH] wlroots: Fix the build on master I was testing the build on nixos-unstable but 64d50a00991983e90d6a22f39d03b028602e34d6 added another patch. Since this patch is already in 0.48.0 it can't be applied again (overriding Meson isn't optimal but we can't build wlroots with 0.46.1). I've also dropped the "-Dxcb-xkb=enabled" flag since it was removed (replaced with Xinput). Thanks @kenogo for noticing this :) --- pkgs/development/libraries/wlroots/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 9791f04fd87..efe7214ab6a 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -17,8 +17,11 @@ let inherit pname version; sha256 = "0qawsm6px1vca3babnqwn0hmkzsxy4w0gi345apd2qk3v0cv7ipc"; }; - patches = builtins.filter # Remove gir-fallback-path.patch - (str: !(stdenv.lib.hasSuffix "gir-fallback-path.patch" str)) + # Remove gir-fallback-path.patch and + # a87496addd9160300837aa50193f4798c6f1d251.patch (already in 0.48.0): + patches = builtins.filter + (str: !(stdenv.lib.hasSuffix "gir-fallback-path.patch" str + || stdenv.lib.hasSuffix "a87496addd9160300837aa50193f4798c6f1d251.patch" str)) oldAttrs.patches; }); in stdenv.mkDerivation rec { @@ -50,7 +53,7 @@ in stdenv.mkDerivation rec { mesonFlags = [ "-Dlibcap=enabled" "-Dlogind=enabled" "-Dxwayland=enabled" "-Dx11-backend=enabled" - "-Dxcb-icccm=enabled" "-Dxcb-xkb=enabled" "-Dxcb-errors=enabled" + "-Dxcb-icccm=enabled" "-Dxcb-errors=enabled" ]; postInstall = ''