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

clutter-gst2: remove unused version

Browse Source
This commit is contained in:
Alexander Ried 2016-09-25 15:32:52 +02:00
parent 70122cf43b
commit 55a1a67111
4 changed files with 9 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,7 +45,8 @@ let
hitori gnome-taquin 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;
inherit (pkgs.gnome2) ORBit2; inherit (pkgs.gnome2) ORBit2;
libsoup = pkgs.libsoup.override { gnomeSupport = true; }; libsoup = pkgs.libsoup.override { gnomeSupport = true; };
libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; libchamplain = pkgs.libchamplain.override { libsoup = libsoup; };
@ -53,8 +54,6 @@ let
gnome3 = self // { recurseForDerivations = false; }; gnome3 = self // { recurseForDerivations = false; };
clutter = pkgs.clutter_1_26; clutter = pkgs.clutter_1_26;
clutter_gtk = pkgs.clutter_gtk_1_8.override { inherit clutter gtk3; }; 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; cogl = pkgs.cogl_1_22;
gtk = gtk3; gtk = gtk3;
gtkmm = gtkmm3; 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 }: { fetchurl, stdenv, pkgconfig, clutter, gtk3, glib, cogl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "clutter-gst-2.0.12"; major = "3.0";
minor = "18";
name = "clutter-gst-${major}.${minor}";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/clutter-gst/2.0/${name}.tar.xz"; url = "mirror://gnome/sources/clutter-gst/${major}/${name}.tar.xz";
sha256 = "1dgzpd5l5ld622b8185c3khvvllm5hfvq4q1a1mgzhxhj8v4bwf2"; sha256 = "14w0pi9myvcn1yxzmk9sk8dghj17m5ji3aqdpfjikk90c060vv0a";
}; };
propagatedBuildInputs = [ clutter gtk3 glib cogl ]; propagatedBuildInputs = [ clutter gtk3 glib cogl ];

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

@ -7255,10 +7255,8 @@ in
cogl = cogl_1_22; cogl = cogl_1_22;
}; };
clutter-gst = callPackage ../development/libraries/clutter-gst { }; clutter-gst = callPackage ../development/libraries/clutter-gst {
inherit (gnome3) cogl clutter;
clutter-gst_3_0 = callPackage ../development/libraries/clutter-gst/3.0.nix {
clutter = clutter_1_22;
}; };
clutter_gtk = callPackage ../development/libraries/clutter-gtk { }; clutter_gtk = callPackage ../development/libraries/clutter-gtk { };