public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "add back wayland 1.5 for cogl 1.18" 

This reverts commit 9c997fe446.
This commit is contained in:
Luca Bruno 2014-11-10 01:03:32 +01:00
parent 65e6449faa
commit 2e380c0070
2 changed files with 1 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/development/libraries/wayland/1.5.nix
View File

@ -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;
};
}

6
pkgs/top-level/all-packages.nix
View File

@ -4972,9 +4972,7 @@ let
cogl = callPackage ../development/libraries/cogl { }; 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 { }; coin3d = callPackage ../development/libraries/coin3d { };
@ -7005,8 +7003,6 @@ let
wayland = callPackage ../development/libraries/wayland { }; wayland = callPackage ../development/libraries/wayland { };
wayland_1_5 = callPackage ../development/libraries/wayland/1.5.nix { };
webkit = webkitgtk; webkit = webkitgtk;
webkitgtk = callPackage ../development/libraries/webkitgtk { webkitgtk = callPackage ../development/libraries/webkitgtk {