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

cogl: remove old version, make 1.22 default

Browse Source
This commit is contained in:
Alexander Ried 2016-09-27 00:00:03 +02:00
parent fc39a9a314
commit 8976c70eda
4 changed files with 6 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/desktops/gnome-3/3.20/default.nix
View File

@ -46,13 +46,12 @@ let
];
inherit (pkgs) glib gtk2 webkitgtk24x webkitgtk212x gtk3 gtkmm3 libcanberra_gtk2
clutter clutter-gst clutter_gtk;
clutter clutter-gst clutter_gtk cogl;
inherit (pkgs.gnome2) ORBit2;
libsoup = pkgs.libsoup.override { gnomeSupport = true; };
libchamplain = pkgs.libchamplain.override { libsoup = libsoup; };
orbit = ORBit2;
gnome3 = self // { recurseForDerivations = false; };
cogl = pkgs.cogl_1_22;
gtk = gtk3;
gtkmm = gtkmm3;
gtkvnc = pkgs.gtkvnc.override { enableGTK3 = true; };

56
pkgs/development/libraries/cogl/1.22.nix
View File

@ -1,56 +0,0 @@
{ stdenv, fetchurl, pkgconfig, mesa_noglu, glib, gdk_pixbuf, xorg, libintlOrEmpty
, pangoSupport ? true, pango, cairo, gobjectIntrospection
, gstreamerSupport ? true, gst_all_1 }:
let
ver_maj = "1.22";
ver_min = "0";
in
stdenv.mkDerivation rec {
name = "cogl-${ver_maj}.${ver_min}";
src = fetchurl {
url = "mirror://gnome/sources/cogl/${ver_maj}/${name}.tar.xz";
sha256 = "689dfb5d14fc1106e9d2ded0f7930dcf7265d0bc84fa846b4f03941633eeaa91";
};
nativeBuildInputs = [ pkgconfig ];
configureFlags = [
"--enable-introspection"
"--enable-kms-egl-platform"
] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst"
++ stdenv.lib.optionals (!stdenv.isDarwin) [ "--enable-gles1" "--enable-gles2" ];
propagatedBuildInputs = with xorg; [
glib gdk_pixbuf gobjectIntrospection
mesa_noglu libXrandr libXfixes libXcomposite libXdamage
]
++ libintlOrEmpty
++ stdenv.lib.optionals gstreamerSupport [ gst_all_1.gstreamer
gst_all_1.gst-plugins-base ];
buildInputs = stdenv.lib.optionals pangoSupport [ pango cairo ];
COGL_PANGO_DEP_CFLAGS
= stdenv.lib.optionalString (stdenv.isDarwin && pangoSupport)
"-I${pango.dev}/include/pango-1.0 -I${cairo.dev}/include/cairo";
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 ];
longDescription = ''
Cogl is a small open source library for using 3D graphics hardware for
rendering. The API departs from the flat state machine style of OpenGL
and is designed to make it easy to write orthogonal components that can
render without stepping on each other's toes.
'';
platforms = stdenv.lib.platforms.mesaPlatforms;
};
}

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

@ -3,7 +3,7 @@
, gstreamerSupport ? true, gst_all_1 }:
let
ver_maj = "1.16";
ver_maj = "1.22";
ver_min = "0";
in
stdenv.mkDerivation rec {
@ -11,17 +11,16 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/cogl/${ver_maj}/${name}.tar.xz";
sha256 = "153014xygwyz9wmvgfwjxncqgc0qqvcy6b3jx1zdl3q5d9iw9hkm";
sha256 = "689dfb5d14fc1106e9d2ded0f7930dcf7265d0bc84fa846b4f03941633eeaa91";
};
nativeBuildInputs = [ pkgconfig ];
configureFlags = [
"--enable-introspection"
"--enable-gles1"
"--enable-gles2"
"--enable-kms-egl-platform"
] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst";
] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst"
++ stdenv.lib.optionals (!stdenv.isDarwin) [ "--enable-gles1" "--enable-gles2" ];
propagatedBuildInputs = with xorg; [
glib gdk_pixbuf gobjectIntrospection

7
pkgs/top-level/all-packages.nix
View File

@ -7223,12 +7223,9 @@ in
clucene_core = clucene_core_1;
clutter = callPackage ../development/libraries/clutter {
cogl = cogl_1_22;
};
clutter = callPackage ../development/libraries/clutter { };
clutter-gst = callPackage ../development/libraries/clutter-gst {
inherit (gnome3) cogl;
};
clutter_gtk = callPackage ../development/libraries/clutter-gtk { };
@ -7239,8 +7236,6 @@ in
cogl = callPackage ../development/libraries/cogl { };
cogl_1_22 = callPackage ../development/libraries/cogl/1.22.nix { };
coin3d = callPackage ../development/libraries/coin3d { };
CoinMP = callPackage ../development/libraries/CoinMP { };