From 2e380c0070c3e22d2f17ed91e82e29a4d9d9cfca Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Mon, 10 Nov 2014 01:03:32 +0100
Subject: [PATCH] Revert "add back wayland 1.5 for cogl 1.18"

This reverts commit 9c997fe4464752fa8ed6e4eba2c51fe154642366.
---
 pkgs/development/libraries/wayland/1.5.nix | 21 ---------------------
 pkgs/top-level/all-packages.nix            |  6 +-----
 2 files changed, 1 insertion(+), 26 deletions(-)
 delete mode 100644 pkgs/development/libraries/wayland/1.5.nix

diff --git a/pkgs/development/libraries/wayland/1.5.nix b/pkgs/development/libraries/wayland/1.5.nix
deleted file mode 100644
index ae9fac06eee..00000000000
--- a/pkgs/development/libraries/wayland/1.5.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, libffi, expat, pkgconfig, libxslt, docbook_xsl, doxygen }:
-
-let version = "1.5.0"; in
-
-stdenv.mkDerivation rec {
-  name = "wayland-${version}";
-
-  src = fetchurl {
-    url = "http://wayland.freedesktop.org/releases/${name}.tar.xz";
-    sha256 = "1da179livkkmfsds32yhh4zflxn9qs6av023702kx2w8mzly2s80";
-  };
-
-  buildInputs = [ pkgconfig libffi expat libxslt docbook_xsl doxygen ];
-
-  meta = {
-    description = "Reference implementation of the wayland protocol";
-    homepage = http://wayland.freedesktop.org/;
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 439d3810381..3d93e3f8346 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4972,9 +4972,7 @@ let
 
   cogl = callPackage ../development/libraries/cogl { };
 
-  cogl_1_18 = callPackage ../development/libraries/cogl/1.18.nix {
-    wayland = wayland_1_5;
-  };
+  cogl_1_18 = callPackage ../development/libraries/cogl/1.18.nix { };
 
   coin3d = callPackage ../development/libraries/coin3d { };
 
@@ -7004,8 +7002,6 @@ let
   };
 
   wayland = callPackage ../development/libraries/wayland { };
-  
-  wayland_1_5 = callPackage ../development/libraries/wayland/1.5.nix { };
 
   webkit = webkitgtk;