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

cogl, clutter: update to 1.16.{0,2}

Browse Source
This commit is contained in:
Vladimír Čunát 2013-12-05 22:50:41 +01:00
parent 3a5f9ecd70
commit 7e9b24c8f1
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/libraries/clutter/default.nix
View File

@ -1,12 +1,16 @@
{ stdenv, fetchurl, glib, pkgconfig, mesa, libX11, libXext, libXfixes { stdenv, fetchurl, glib, pkgconfig, mesa, libX11, libXext, libXfixes
, libXdamage, libXcomposite, libXi, cogl, pango, atk, json_glib }: , libXdamage, libXcomposite, libXi, cogl, pango, atk, json_glib }:
stdenv.mkDerivation { let
name = "clutter-1.8.2"; ver_maj = "1.16";
ver_min = "2";
in
stdenv.mkDerivation rec {
name = "clutter-${ver_maj}.${ver_min}";
src = fetchurl { src = fetchurl {
url = mirror://gnome/sources/clutter/1.8/clutter-1.8.2.tar.xz; url = "mirror://gnome/sources/clutter/${ver_maj}/${name}.tar.xz";
sha256 = "0bzsvnharawfg525lpavrp55mq4aih5nb01dwwqwnccg8hk9z2fw"; sha256 = "0hnz6fnrkc7ixrm2x83sxyha32p9896d7ilzhvxwfgzlh26fidqc";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
@ -17,6 +21,8 @@ stdenv.mkDerivation {
configureFlags = [ "--disable-introspection" ]; # not needed anywhere AFAIK configureFlags = [ "--disable-introspection" ]; # not needed anywhere AFAIK
#doCheck = true; # no tests possible without a display
meta = { meta = {
description = "Clutter, a library for creating fast, dynamic graphical user interfaces"; description = "Clutter, a library for creating fast, dynamic graphical user interfaces";

19
pkgs/development/libraries/cogl/default.nix
View File

@ -1,19 +1,22 @@
{ stdenv, fetchurl, pkgconfig, mesa, glib, gdk_pixbuf, libXfixes, libXcomposite { stdenv, fetchurl, pkgconfig, mesa, glib, gdk_pixbuf, xorg, libintlOrEmpty
, libXdamage, libintlOrEmpty
, pangoSupport ? true, pango, cairo }: , pangoSupport ? true, pango, cairo }:
let
ver_maj = "1.16";
ver_min = "0";
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "cogl-1.8.2"; name = "cogl-${ver_maj}.${ver_min}";
src = fetchurl { src = fetchurl {
url = mirror://gnome/sources/cogl/1.8/cogl-1.8.2.tar.xz; url = "mirror://gnome/sources/cogl/${ver_maj}/${name}.tar.xz";
sha256 = "1ix87hz3qxqysqwx58wbc46lzchlmfs08fjzbf3l6mmsqj8gs9pc"; sha256 = "153014xygwyz9wmvgfwjxncqgc0qqvcy6b3jx1zdl3q5d9iw9hkm";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs = propagatedBuildInputs = with xorg;
[ mesa glib gdk_pixbuf libXfixes libXcomposite libXdamage ] [ mesa glib gdk_pixbuf libXfixes libXcomposite libXdamage libXrandr ]
++ libintlOrEmpty; ++ libintlOrEmpty;
buildInputs = stdenv.lib.optionals pangoSupport [ pango cairo ]; buildInputs = stdenv.lib.optionals pangoSupport [ pango cairo ];
@ -24,6 +27,8 @@ stdenv.mkDerivation rec {
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
#doCheck = true; # all tests fail (no idea why)
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A small open source library for using 3D graphics hardware for rendering"; description = "A small open source library for using 3D graphics hardware for rendering";
maintainers = with maintainers; [ lovek323 ]; maintainers = with maintainers; [ lovek323 ];