From c68850c6be7e6e9ee0148280e4edb21ac9601f67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 24 Sep 2016 19:17:32 +0200
Subject: [PATCH] nixos opengl: use mesa_drivers.out

...instead of mesa_noglu.out. Closures of systems remain unchanged,
as both are in (and the .out output is very small anyway).
This is to make sure that we use lib*GL* that aren't slowed down by grsecurity.
---
 nixos/modules/hardware/opengl.nix          |  2 +-
 pkgs/development/libraries/wayland/1.9.nix | 33 ++++++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/wayland/1.9.nix

diff --git a/nixos/modules/hardware/opengl.nix b/nixos/modules/hardware/opengl.nix
index 0bc574d48190..bef500e30c0b 100644
--- a/nixos/modules/hardware/opengl.nix
+++ b/nixos/modules/hardware/opengl.nix
@@ -14,7 +14,7 @@ let
     name = "mesa-drivers+txc-${p.mesa_drivers.version}";
     paths =
       [ p.mesa_drivers
-        p.mesa_noglu # mainly for libGL
+        p.mesa_drivers.out # mainly for libGL
         (if cfg.s3tcSupport then p.libtxc_dxtn else p.libtxc_dxtn_s2tc)
       ];
   };
diff --git a/pkgs/development/libraries/wayland/1.9.nix b/pkgs/development/libraries/wayland/1.9.nix
new file mode 100644
index 000000000000..4c6d95e67c0f
--- /dev/null
+++ b/pkgs/development/libraries/wayland/1.9.nix
@@ -0,0 +1,33 @@
+{ lib, stdenv, fetchurl, pkgconfig
+, libffi, docbook_xsl, doxygen, graphviz, libxslt, xmlto, libxml2
+, expat ? null # Build wayland-scanner (currently cannot be disabled as of 1.7.0)
+}:
+
+# Require the optional to be enabled until upstream fixes or removes the configure flag
+assert expat != null;
+
+stdenv.mkDerivation rec {
+  name = "wayland-${version}";
+  version = "1.9.0";
+
+  src = fetchurl {
+    url = "http://wayland.freedesktop.org/releases/${name}.tar.xz";
+    sha256 = "1yhy62vkbq8j8c9zaa6yzvn75cd99kfa8n2zfdwl80x019r711ww";
+  };
+
+  configureFlags = "--with-scanner --disable-documentation";
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  buildInputs = [ libffi /* docbook_xsl doxygen graphviz libxslt xmlto */ expat libxml2 ];
+
+  meta = {
+    description = "Reference implementation of the wayland protocol";
+    homepage    = http://wayland.freedesktop.org/;
+    license     = lib.licenses.mit;
+    platforms   = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ codyopel wkennington ];
+  };
+
+  passthru.version = version;
+}