mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-27 13:57:10 +03:00
cogl, clutter: update to 1.16.{0,2}
This commit is contained in:
parent
3a5f9ecd70
commit
7e9b24c8f1
@ -1,12 +1,16 @@
|
||||
{ stdenv, fetchurl, glib, pkgconfig, mesa, libX11, libXext, libXfixes
|
||||
, libXdamage, libXcomposite, libXi, cogl, pango, atk, json_glib }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "clutter-1.8.2";
|
||||
let
|
||||
ver_maj = "1.16";
|
||||
ver_min = "2";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "clutter-${ver_maj}.${ver_min}";
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://gnome/sources/clutter/1.8/clutter-1.8.2.tar.xz;
|
||||
sha256 = "0bzsvnharawfg525lpavrp55mq4aih5nb01dwwqwnccg8hk9z2fw";
|
||||
url = "mirror://gnome/sources/clutter/${ver_maj}/${name}.tar.xz";
|
||||
sha256 = "0hnz6fnrkc7ixrm2x83sxyha32p9896d7ilzhvxwfgzlh26fidqc";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
@ -17,6 +21,8 @@ stdenv.mkDerivation {
|
||||
|
||||
configureFlags = [ "--disable-introspection" ]; # not needed anywhere AFAIK
|
||||
|
||||
#doCheck = true; # no tests possible without a display
|
||||
|
||||
meta = {
|
||||
description = "Clutter, a library for creating fast, dynamic graphical user interfaces";
|
||||
|
||||
|
@ -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 ];
|
||||
|
Loading…
Reference in New Issue
Block a user