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

clutter: remove old version, make 1.26 default

Browse Source
This commit is contained in:
Alexander Ried 2016-09-26 23:40:20 +02:00
parent 4020035513
commit fc39a9a314
4 changed files with 9 additions and 66 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-gst clutter_gtk;
clutter clutter-gst clutter_gtk;
inherit (pkgs.gnome2) ORBit2;
libsoup = pkgs.libsoup.override { gnomeSupport = true; };
libchamplain = pkgs.libchamplain.override { libsoup = libsoup; };
orbit = ORBit2;
gnome3 = self // { recurseForDerivations = false; };
clutter = pkgs.clutter_1_26;
cogl = pkgs.cogl_1_22;
gtk = gtk3;
gtkmm = gtkmm3;

52
pkgs/development/libraries/clutter/1.26.nix
View File

@ -1,52 +0,0 @@
{ stdenv, fetchurl, glib, pkgconfig, mesa, libX11, libXext, libXfixes
, libXdamage, libXcomposite, libXi, cogl, pango, atk, json_glib,
gobjectIntrospection
}:
let
ver_maj = "1.26";
ver_min = "0";
in
stdenv.mkDerivation rec {
name = "clutter-${ver_maj}.${ver_min}";
src = fetchurl {
url = "mirror://gnome/sources/clutter/${ver_maj}/${name}.tar.xz";
sha256 = "01nfjd4k7j2n3agpx2d9ncff86nfsqv4n23465rb9zmk4iw4wlb7";
};
nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs =
[ libX11 mesa libXext libXfixes libXdamage libXcomposite libXi cogl pango
atk json_glib gobjectIntrospection
];
configureFlags = [ "--enable-introspection" ]; # needed by muffin AFAIK
#doCheck = true; # no tests possible without a display
meta = {
description = "Clutter, a library for creating fast, dynamic graphical user interfaces";
longDescription =
'' Clutter is free software library for creating fast, compelling,
portable, and dynamic graphical user interfaces. It is a core part
of MeeGo, and is supported by the open source community. Its
development is sponsored by Intel.
Clutter uses OpenGL for rendering (and optionally OpenGL|ES for use
on mobile and embedded platforms), but wraps an easy to use,
efficient, flexible API around GL's complexity.
Clutter enforces no particular user interface style, but provides a
rich, generic foundation for higher-level toolkits tailored to
specific needs.
'';
license = stdenv.lib.licenses.lgpl2Plus;
homepage = http://www.clutter-project.org/;
maintainers = with stdenv.lib.maintainers; [ urkud lethalman ];
platforms = stdenv.lib.platforms.mesaPlatforms;
};
}

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

@ -1,24 +1,24 @@
{ stdenv, fetchurl, glib, pkgconfig, mesa, libX11, libXext, libXfixes
, libXdamage, libXcomposite, libXi, cogl, pango, atk, json_glib,
gobjectIntrospection, gtk3
gobjectIntrospection
}:
let
ver_maj = "1.16";
ver_min = "2";
ver_maj = "1.26";
ver_min = "0";
in
stdenv.mkDerivation rec {
name = "clutter-${ver_maj}.${ver_min}";
src = fetchurl {
url = "mirror://gnome/sources/clutter/${ver_maj}/${name}.tar.xz";
sha256 = "0hnz6fnrkc7ixrm2x83sxyha32p9896d7ilzhvxwfgzlh26fidqc";
sha256 = "01nfjd4k7j2n3agpx2d9ncff86nfsqv4n23465rb9zmk4iw4wlb7";
};
nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs =
[ libX11 mesa libXext libXfixes libXdamage libXcomposite libXi cogl pango
atk json_glib gobjectIntrospection gtk3
atk json_glib gobjectIntrospection
];
configureFlags = [ "--enable-introspection" ]; # needed by muffin AFAIK

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

@ -7223,19 +7223,15 @@ in
clucene_core = clucene_core_1;
clutter = callPackage ../development/libraries/clutter { };
clutter_1_26 = callPackage ../development/libraries/clutter/1.26.nix {
clutter = callPackage ../development/libraries/clutter {
cogl = cogl_1_22;
};
clutter-gst = callPackage ../development/libraries/clutter-gst {
inherit (gnome3) cogl clutter;
inherit (gnome3) cogl;
};
clutter_gtk = callPackage ../development/libraries/clutter-gtk {
inherit (gnome3) clutter;
};
clutter_gtk = callPackage ../development/libraries/clutter-gtk { };
cminpack = callPackage ../development/libraries/cminpack { };