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

wlroots: Fix the build on master

Browse Source 
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 :)
This commit is contained in:
Michael Weiss 2018-11-30 14:23:33 +01:00
parent aa490a543e
commit 99d623850f
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/libraries/wlroots/default.nix
View File

@ -17,8 +17,11 @@ let
inherit pname version; inherit pname version;
sha256 = "0qawsm6px1vca3babnqwn0hmkzsxy4w0gi345apd2qk3v0cv7ipc"; sha256 = "0qawsm6px1vca3babnqwn0hmkzsxy4w0gi345apd2qk3v0cv7ipc";
}; };
patches = builtins.filter # Remove gir-fallback-path.patch # Remove gir-fallback-path.patch and
(str: !(stdenv.lib.hasSuffix "gir-fallback-path.patch" str)) # 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; oldAttrs.patches;
}); });
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
@ -50,7 +53,7 @@ in stdenv.mkDerivation rec {
mesonFlags = [ mesonFlags = [
"-Dlibcap=enabled" "-Dlogind=enabled" "-Dxwayland=enabled" "-Dx11-backend=enabled" "-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 = '' postInstall = ''