diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-12-05 22:50:41 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-12-05 22:52:29 +0100 |
| commit | 7e9b24c8f1204b212a5c8b83f395e9be29ebe37e (patch) | |
| tree | 94222b43ec7d96343c4366aeae2b36629b116a16 /pkgs/development/libraries/cogl | |
| parent | 3a5f9ecd70d59ac7c4ebe6c375ae1a960462ccd3 (diff) | |
| download | nixpkgs-7e9b24c8f1204b212a5c8b83f395e9be29ebe37e.tar nixpkgs-7e9b24c8f1204b212a5c8b83f395e9be29ebe37e.tar.gz nixpkgs-7e9b24c8f1204b212a5c8b83f395e9be29ebe37e.tar.bz2 nixpkgs-7e9b24c8f1204b212a5c8b83f395e9be29ebe37e.tar.lz nixpkgs-7e9b24c8f1204b212a5c8b83f395e9be29ebe37e.tar.xz nixpkgs-7e9b24c8f1204b212a5c8b83f395e9be29ebe37e.tar.zst nixpkgs-7e9b24c8f1204b212a5c8b83f395e9be29ebe37e.zip | |
cogl, clutter: update to 1.16.{0,2}
Diffstat (limited to 'pkgs/development/libraries/cogl')
| -rw-r--r-- | pkgs/development/libraries/cogl/default.nix | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index abb92f7b08b..46a46773810 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -1,19 +1,22 @@ -{ stdenv, fetchurl, pkgconfig, mesa, glib, gdk_pixbuf, libXfixes, libXcomposite -, libXdamage, libintlOrEmpty +{ stdenv, fetchurl, pkgconfig, mesa, glib, gdk_pixbuf, xorg, libintlOrEmpty , pangoSupport ? true, pango, cairo }: +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 ]; - propagatedBuildInputs = - [ mesa glib gdk_pixbuf libXfixes libXcomposite libXdamage ] + propagatedBuildInputs = with xorg; + [ mesa glib gdk_pixbuf libXfixes libXcomposite libXdamage libXrandr ] ++ libintlOrEmpty; buildInputs = stdenv.lib.optionals pangoSupport [ pango cairo ]; @@ -24,6 +27,8 @@ stdenv.mkDerivation rec { 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 ]; |