MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 15:22:59 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #18955 from groxxda/pinpoint

Browse source 
clutter*, cogl: remove unused versions
This commit is contained in:
Luca Bruno 2016-09-25 17:36:09 +01:00 committed by GitHub
commit 9263ad3ff8
12 changed files with 18 additions and 330 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/desktops/gnome-3/3.20/default.nix
View file

@ -45,16 +45,14 @@ let
hitori gnome-taquin
];
inherit (pkgs) glib gtk2 webkitgtk24x webkitgtk212x gtk3 gtkmm3 libcanberra_gtk2;
inherit (pkgs) glib gtk2 webkitgtk24x webkitgtk212x gtk3 gtkmm3 libcanberra_gtk2
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;
clutter_gtk = pkgs.clutter_gtk_1_8.override { inherit clutter gtk3; };
clutter-gst_2 = pkgs.clutter-gst;
clutter-gst = pkgs.clutter-gst_3_0.override { inherit clutter cogl; };
cogl = pkgs.cogl_1_22;
gtk = gtk3;
gtkmm = gtkmm3;

28
pkgs/development/libraries/clutter-gst/3.0.nix
View file

@ -1,28 +0,0 @@
{ fetchurl, stdenv, pkgconfig, clutter, gtk3, glib, cogl }:
stdenv.mkDerivation rec {
major = "3.0";
minor = "18";
name = "clutter-gst-${major}.${minor}";
src = fetchurl {
url = "mirror://gnome/sources/clutter-gst/${major}/${name}.tar.xz";
sha256 = "14w0pi9myvcn1yxzmk9sk8dghj17m5ji3aqdpfjikk90c060vv0a";
};
propagatedBuildInputs = [ clutter gtk3 glib cogl ];
nativeBuildInputs = [ pkgconfig ];
postBuild = "rm -rf $out/share/gtk-doc";
meta = {
description = "GStreamer bindings for clutter";
homepage = http://www.clutter-project.org/;
license = stdenv.lib.licenses.lgpl2Plus;
maintainers = with stdenv.lib.maintainers; [ lethalman ];
platforms = stdenv.lib.platforms.gnu; # arbitrary choice
};
}

8
pkgs/development/libraries/clutter-gst/default.nix
View file

@ -1,11 +1,13 @@
{ fetchurl, stdenv, pkgconfig, clutter, gtk3, glib, cogl }:
stdenv.mkDerivation rec {
name = "clutter-gst-2.0.12";
major = "3.0";
minor = "18";
name = "clutter-gst-${major}.${minor}";
src = fetchurl {
url = "mirror://gnome/sources/clutter-gst/2.0/${name}.tar.xz";
sha256 = "1dgzpd5l5ld622b8185c3khvvllm5hfvq4q1a1mgzhxhj8v4bwf2";
url = "mirror://gnome/sources/clutter-gst/${major}/${name}.tar.xz";
sha256 = "14w0pi9myvcn1yxzmk9sk8dghj17m5ji3aqdpfjikk90c060vv0a";
};
propagatedBuildInputs = [ clutter gtk3 glib cogl ];

31
pkgs/development/libraries/clutter-gtk/0.10.8.nix
View file

@ -1,31 +0,0 @@
{ fetchurl, stdenv, pkgconfig, clutter, gtk2 }:
stdenv.mkDerivation rec {
name = "clutter-gtk-0.10.8";
src = fetchurl {
urls = [
"http://download.gnome.org/sources/clutter-gtk/0.10/${name}.tar.bz2"
"http://source.clutter-project.org/sources/clutter-gtk/0.10/${name}.tar.bz2"
];
sha256 = "0508x1jfnlq0zhgscysvfa7i7ljkzm23d2myikvdjwc8ar8zjrvq";
};
propagatedBuildInputs = [ clutter gtk2 ];
nativeBuildInputs = [ pkgconfig ];
configureFlags = [ "--disable-introspection" ]; # not needed anywhere AFAIK
postBuild = "rm -rf $out/share/gtk-doc";
meta = {
description = "Clutter-GTK";
homepage = http://www.clutter-project.org/;
license = stdenv.lib.licenses.lgpl2Plus;
maintainers = [ ];
platforms = stdenv.lib.platforms.gnu; # arbitrary choice
};
}

26
pkgs/development/libraries/clutter-gtk/1.4.nix
View file

@ -1,26 +0,0 @@
{ fetchurl, stdenv, pkgconfig, gobjectIntrospection, clutter, gtk3 }:
stdenv.mkDerivation rec {
name = "clutter-gtk-1.4.4";
src = fetchurl {
url = "mirror://gnome/sources/clutter-gtk/1.4/${name}.tar.xz";
sha256 = "bc3108594a01a08bb6d9b538afe995e4fd78634a8356064ee8137d87aad51b2e";
};
propagatedBuildInputs = [ clutter gtk3 ];
nativeBuildInputs = [ pkgconfig gobjectIntrospection ];
postBuild = "rm -rf $out/share/gtk-doc";
meta = {
description = "Clutter-GTK";
homepage = http://www.clutter-project.org/;
license = stdenv.lib.licenses.lgpl2Plus;
maintainers = with stdenv.lib.maintainers; [ urkud lethalman ];
platforms = stdenv.lib.platforms.gnu; # arbitrary choice
};
}

23
pkgs/development/libraries/clutter-gtk/1.6.nix
View file

@ -1,23 +0,0 @@
{ fetchurl, stdenv, pkgconfig, gobjectIntrospection, clutter, gtk3 }:
stdenv.mkDerivation rec {
name = "clutter-gtk-1.6.0";
src = fetchurl {
url = "mirror://gnome/sources/clutter-gtk/1.6/${name}.tar.xz";
sha256 = "883550b574a036363239442edceb61cf3f6bedc8adc97d3404278556dc82234d";
};
propagatedBuildInputs = [ clutter gtk3 ];
nativeBuildInputs = [ pkgconfig gobjectIntrospection ];
postBuild = "rm -rf $out/share/gtk-doc";
meta = {
description = "Clutter-GTK";
homepage = http://www.clutter-project.org/;
license = stdenv.lib.licenses.lgpl2Plus;
maintainers = with stdenv.lib.maintainers; [ urkud lethalman ];
platforms = stdenv.lib.platforms.gnu; # arbitrary choice
};
}

25
pkgs/development/libraries/clutter-gtk/1.8.nix
View file

@ -1,25 +0,0 @@
{ fetchurl, stdenv, pkgconfig, gobjectIntrospection, clutter, gtk3 }:
stdenv.mkDerivation rec {
major = "1.8";
minor = "0";
name = "clutter-gtk-${major}.${minor}";
src = fetchurl {
url = "mirror://gnome/sources/clutter-gtk/${major}/${name}.tar.xz";
sha256 = "07dzvx0b3fsswxnpxgk0adjgccnrvbxsd971naqwndnfivbgjbkl";
};
propagatedBuildInputs = [ clutter gtk3 ];
nativeBuildInputs = [ pkgconfig gobjectIntrospection ];
postBuild = "rm -rf $out/share/gtk-doc";
meta = {
description = "Clutter-GTK";
homepage = http://www.clutter-project.org/;
license = stdenv.lib.licenses.lgpl2Plus;
maintainers = with stdenv.lib.maintainers; [ urkud lethalman ];
platforms = stdenv.lib.platforms.gnu; # arbitrary choice
};
}

13
pkgs/development/libraries/clutter-gtk/default.nix
View file

@ -1,11 +1,13 @@
{ fetchurl, stdenv, pkgconfig, gobjectIntrospection, clutter, gtk3 }:
stdenv.mkDerivation rec {
name = "clutter-gtk-1.4.4";
major = "1.8";
minor = "0";
name = "clutter-gtk-${major}.${minor}";
src = fetchurl {
url = "mirror://gnome/sources/clutter-gtk/1.4/${name}.tar.xz";
sha256 = "bc3108594a01a08bb6d9b538afe995e4fd78634a8356064ee8137d87aad51b2e";
url = "mirror://gnome/sources/clutter-gtk/${major}/${name}.tar.xz";
sha256 = "07dzvx0b3fsswxnpxgk0adjgccnrvbxsd971naqwndnfivbgjbkl";
};
propagatedBuildInputs = [ clutter gtk3 ];
@ -15,12 +17,9 @@ stdenv.mkDerivation rec {
meta = {
description = "Clutter-GTK";
homepage = http://www.clutter-project.org/;
license = stdenv.lib.licenses.lgpl2Plus;
maintainers = with stdenv.lib.maintainers; [ urkud ];
maintainers = with stdenv.lib.maintainers; [ urkud lethalman ];
platforms = stdenv.lib.platforms.gnu; # arbitrary choice
};
}

52
pkgs/development/libraries/clutter/1.22.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.22";
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 = "5225fef91f717118654a5b98e24f2018d09ca3c37d61ecff84f77069de0fbf54";
};
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;
};
}

52
pkgs/development/libraries/clutter/1.24.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.24";
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 = "85c87d5745b97af7633776419a47421aae7cea66c1b870f88cc5e06a4c5626e6";
};
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;
};
}

56
pkgs/development/libraries/cogl/1.20.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.20";
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 = "729e35495829e7d31fafa3358e47b743ba21a2b08ff9b6cd28fb74c0de91192b";
};
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;
};
}

28
pkgs/top-level/all-packages.nix
View file

@ -7243,31 +7243,16 @@ in
clutter = callPackage ../development/libraries/clutter { };
clutter_1_22 = callPackage ../development/libraries/clutter/1.22.nix {
cogl = cogl_1_20;
};
clutter_1_24 = callPackage ../development/libraries/clutter/1.24.nix {
cogl = cogl_1_22;
};
clutter_1_26 = callPackage ../development/libraries/clutter/1.26.nix {
cogl = cogl_1_22;
};
clutter-gst = callPackage ../development/libraries/clutter-gst { };
clutter-gst_3_0 = callPackage ../development/libraries/clutter-gst/3.0.nix {
clutter = clutter_1_22;
clutter-gst = callPackage ../development/libraries/clutter-gst {
inherit (gnome3) cogl clutter;
};
clutter_gtk = callPackage ../development/libraries/clutter-gtk { };
clutter_gtk_0_10 = callPackage ../development/libraries/clutter-gtk/0.10.8.nix { };
clutter_gtk_1_6 = callPackage ../development/libraries/clutter-gtk/1.6.nix {
clutter = clutter_1_22;
};
clutter_gtk_1_8 = callPackage ../development/libraries/clutter-gtk/1.8.nix {
clutter = clutter_1_26;
clutter_gtk = callPackage ../development/libraries/clutter-gtk {
inherit (gnome3) clutter;
};
cminpack = callPackage ../development/libraries/cminpack { };
@ -7276,8 +7261,6 @@ in
cogl = callPackage ../development/libraries/cogl { };
cogl_1_20 = callPackage ../development/libraries/cogl/1.20.nix { };
cogl_1_22 = callPackage ../development/libraries/cogl/1.22.nix { };
coin3d = callPackage ../development/libraries/coin3d { };
@ -14656,8 +14639,7 @@ in
pinfo = callPackage ../applications/misc/pinfo { };
pinpoint = callPackage ../applications/office/pinpoint {
clutter = clutter_1_24;
clutter_gtk = clutter_gtk_1_6;
inherit (gnome3) clutter clutter_gtk;
};
pinta = callPackage ../applications/graphics/pinta {