about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorLuca Bruno <lucabru@src.gnome.org>2014-11-10 00:09:55 +0100
committerLuca Bruno <lucabru@src.gnome.org>2014-11-10 00:13:53 +0100
commit9c997fe4464752fa8ed6e4eba2c51fe154642366 (patch)
treec0b9397072386dedf0edf157b8ef5d5a3cb7b0c4 /pkgs
parentc81b6fc4b82b4c3bdece27180850a204dd849194 (diff)
downloadnixlib-9c997fe4464752fa8ed6e4eba2c51fe154642366.tar
nixlib-9c997fe4464752fa8ed6e4eba2c51fe154642366.tar.gz
nixlib-9c997fe4464752fa8ed6e4eba2c51fe154642366.tar.bz2
nixlib-9c997fe4464752fa8ed6e4eba2c51fe154642366.tar.lz
nixlib-9c997fe4464752fa8ed6e4eba2c51fe154642366.tar.xz
nixlib-9c997fe4464752fa8ed6e4eba2c51fe154642366.tar.zst
nixlib-9c997fe4464752fa8ed6e4eba2c51fe154642366.zip
add back wayland 1.5 for cogl 1.18
Wayland 1.6 removed wayland-egl.pc
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/libraries/wayland/1.5.nix21
-rw-r--r--pkgs/top-level/all-packages.nix6
2 files changed, 26 insertions, 1 deletions
diff --git a/pkgs/development/libraries/wayland/1.5.nix b/pkgs/development/libraries/wayland/1.5.nix
new file mode 100644
index 000000000000..ae9fac06eeec
--- /dev/null
+++ b/pkgs/development/libraries/wayland/1.5.nix
@@ -0,0 +1,21 @@
+{ 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 3d93e3f83462..439d38103816 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4972,7 +4972,9 @@ let
 
   cogl = callPackage ../development/libraries/cogl { };
 
-  cogl_1_18 = callPackage ../development/libraries/cogl/1.18.nix { };
+  cogl_1_18 = callPackage ../development/libraries/cogl/1.18.nix {
+    wayland = wayland_1_5;
+  };
 
   coin3d = callPackage ../development/libraries/coin3d { };
 
@@ -7002,6 +7004,8 @@ let
   };
 
   wayland = callPackage ../development/libraries/wayland { };
+  
+  wayland_1_5 = callPackage ../development/libraries/wayland/1.5.nix { };
 
   webkit = webkitgtk;