From b5dea5c86a67593c6618f08429ec7c81c16622c2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Jun 2015 21:01:53 +0200
Subject: [PATCH] Fix wayland

---
 pkgs/development/libraries/wayland/default.nix | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix
index 00061e79fa5..16d2298279b 100644
--- a/pkgs/development/libraries/wayland/default.nix
+++ b/pkgs/development/libraries/wayland/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig
+{ lib, stdenv, fetchurl, pkgconfig
 , libffi, docbook_xsl, doxygen, graphviz, libxslt, xmlto
 , expat ? null # Build wayland-scanner (currently cannot be disabled as of 1.7.0)
 }:
@@ -6,7 +6,6 @@
 # Require the optional to be enabled until upstream fixes or removes the configure flag
 assert expat != null;
 
-with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "wayland-${version}";
   version = "1.7.0";
@@ -16,9 +15,7 @@ stdenv.mkDerivation rec {
     sha256 = "173w0pqzk2m7hjlg15bymrx7ynxgq1ciadg03hzybxwnvfi4gsmx";
   };
 
-  configureFlags = [
-    (mkEnable (expat != null) "scanner" null)
-  ];
+  configureFlags = "--with-scanner";
 
   nativeBuildInputs = [ pkgconfig ];
 
@@ -27,9 +24,9 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Reference implementation of the wayland protocol";
     homepage    = http://wayland.freedesktop.org/;
-    license     = licenses.mit;
-    platforms   = platforms.linux;
-    maintainers = with maintainers; [ codyopel wkennington ];
+    license     = lib.licenses.mit;
+    platforms   = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ codyopel wkennington ];
   };
 
   passthru.version = version;