summary refs log tree commit diff
path: root/pkgs/development/libraries/cogl/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/development/libraries/cogl/default.nix')
-rw-r--r--pkgs/development/libraries/cogl/default.nix35
1 files changed, 24 insertions, 11 deletions
diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix
index b02319fd3e8..1fc1021156d 100644
--- a/pkgs/development/libraries/cogl/default.nix
+++ b/pkgs/development/libraries/cogl/default.nix
@@ -1,22 +1,33 @@
-{ stdenv, fetchurl, pkgconfig, mesa, glib, gdk_pixbuf, libXfixes, libXcomposite
-, libXdamage, libintlOrEmpty
-, pangoSupport ? true, pango, cairo, gobjectIntrospection }:
+{ stdenv, fetchurl, pkgconfig, mesa_noglu, glib, gdk_pixbuf, xorg, libintlOrEmpty
+, pangoSupport ? true, pango, cairo, gobjectIntrospection, wayland }:
 
+let
+  ver_maj = "1.16";
+  ver_min = "0";
+in
 stdenv.mkDerivation rec {
-  name = "cogl-1.8.2";
+  name = "cogl-${ver_maj}.${ver_min}";
 
   src = fetchurl {
-    url = mirror://gnome/sources/cogl/1.8/cogl-1.8.2.tar.xz;
-    sha256 = "1ix87hz3qxqysqwx58wbc46lzchlmfs08fjzbf3l6mmsqj8gs9pc";
+    url = "mirror://gnome/sources/cogl/${ver_maj}/${name}.tar.xz";
+    sha256 = "153014xygwyz9wmvgfwjxncqgc0qqvcy6b3jx1zdl3q5d9iw9hkm";
   };
 
   nativeBuildInputs = [ pkgconfig ];
 
-  configureFlags = " --enable-introspection " ; 
-
-  propagatedBuildInputs =
-    [ mesa glib gdk_pixbuf libXfixes libXcomposite libXdamage 
-gobjectIntrospection ]
+  configureFlags = [
+    "--enable-introspection"
+    "--enable-gles1"
+    "--enable-gles2"
+    "--enable-kms-egl-platform"
+    "--enable-wayland-egl-platform"
+    "--enable-wayland-egl-server"
+  ];
+
+  propagatedBuildInputs = with xorg; [
+      glib gdk_pixbuf gobjectIntrospection
+      mesa_noglu libXrandr libXfixes libXcomposite libXdamage wayland
+    ]
     ++ libintlOrEmpty;
 
   buildInputs = stdenv.lib.optionals pangoSupport [ pango cairo ];
@@ -27,6 +38,8 @@ gobjectIntrospection ]
 
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
 
+  #doCheck = true; # all tests fail (no idea why)
+
   meta = with stdenv.lib; {
     description = "A small open source library for using 3D graphics hardware for rendering";
     maintainers = with maintainers; [ lovek323 ];