From 4d8afa2c4b6c3db94d562e2488a6f0e8fdc59adc Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Mon, 10 Nov 2014 01:07:37 +0100 Subject: cogl: remove wayland support, can't find wayland-egl.pc Don't know how it could build before. --- pkgs/development/libraries/cogl/1.18.nix | 6 ++---- pkgs/development/libraries/cogl/default.nix | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) (limited to 'pkgs/development/libraries/cogl') diff --git a/pkgs/development/libraries/cogl/1.18.nix b/pkgs/development/libraries/cogl/1.18.nix index 7aad8ba1b43..f6927770d86 100644 --- a/pkgs/development/libraries/cogl/1.18.nix +++ b/pkgs/development/libraries/cogl/1.18.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, mesa_noglu, glib, gdk_pixbuf, xorg, libintlOrEmpty -, pangoSupport ? true, pango, cairo, gobjectIntrospection, wayland +, pangoSupport ? true, pango, cairo, gobjectIntrospection , gstreamerSupport ? true, gst_all_1 }: let @@ -21,13 +21,11 @@ stdenv.mkDerivation rec { "--enable-gles1" "--enable-gles2" "--enable-kms-egl-platform" - "--enable-wayland-egl-platform" - "--enable-wayland-egl-server" ] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst"; propagatedBuildInputs = with xorg; [ glib gdk_pixbuf gobjectIntrospection - mesa_noglu libXrandr libXfixes libXcomposite libXdamage wayland + mesa_noglu libXrandr libXfixes libXcomposite libXdamage ] ++ libintlOrEmpty ++ stdenv.lib.optionals gstreamerSupport [ gst_all_1.gstreamer diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index 0f1c1dd82e2..a4a20fce023 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, mesa_noglu, glib, gdk_pixbuf, xorg, libintlOrEmpty -, pangoSupport ? true, pango, cairo, gobjectIntrospection, wayland +, pangoSupport ? true, pango, cairo, gobjectIntrospection , gstreamerSupport ? true, gst_all_1 }: let @@ -21,13 +21,11 @@ stdenv.mkDerivation rec { "--enable-gles1" "--enable-gles2" "--enable-kms-egl-platform" - "--enable-wayland-egl-platform" - "--enable-wayland-egl-server" ] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst"; propagatedBuildInputs = with xorg; [ glib gdk_pixbuf gobjectIntrospection - mesa_noglu libXrandr libXfixes libXcomposite libXdamage wayland + mesa_noglu libXrandr libXfixes libXcomposite libXdamage ] ++ libintlOrEmpty ++ stdenv.lib.optionals gstreamerSupport [ gst_all_1.gstreamer -- cgit 1.4.1