In the current master branch of the Nixpkgs the xwayland expression
does not build and announces an error because the XWAYLANDMODULES are
not found. The attached patch gives the modules to the build and fixes
this.
>From c4a694f975db5ddbbb19e43dbe85933dea04fc84 Mon Sep 17 00:00:00 2001
From: Karn Kallio <kkal...@skami.org>
Date: Sun, 12 Feb 2017 14:18:04 -0400
Subject: [PATCH] xwayland : fix build by giving wayland-protocols to the
build.
---
pkgs/servers/x11/xorg/xwayland.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix
index ee4b5695c7..513e4ceee6 100644
--- a/pkgs/servers/x11/xorg/xwayland.nix
+++ b/pkgs/servers/x11/xorg/xwayland.nix
@@ -1,5 +1,5 @@
-{ stdenv, wayland, xorgserver, xkbcomp, xkeyboard_config, epoxy, libxslt, libunwind, makeWrapper }:
+{ stdenv, wayland, wayland-protocols, xorgserver, xkbcomp, xkeyboard_config, epoxy, libxslt, libunwind, makeWrapper }:
with stdenv.lib;
@@ -7,7 +7,7 @@ overrideDerivation xorgserver (oldAttrs: {
name = "xwayland-${xorgserver.version}";
propagatedNativeBuildInputs = oldAttrs.propagatedNativeBuildInputs
- ++ [wayland epoxy libxslt makeWrapper libunwind];
+ ++ [wayland wayland-protocols epoxy libxslt makeWrapper libunwind];
configureFlags = [
"--disable-docs"
"--disable-devel-docs"
--
2.11.1
_______________________________________________
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev
