diff --git a/pkgs/desktops/gnome-3/3.20/default.nix b/pkgs/desktops/gnome-3/3.20/default.nix index 817c0d9b1d6..b3f757162eb 100644 --- a/pkgs/desktops/gnome-3/3.20/default.nix +++ b/pkgs/desktops/gnome-3/3.20/default.nix @@ -45,7 +45,8 @@ 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; inherit (pkgs.gnome2) ORBit2; libsoup = pkgs.libsoup.override { gnomeSupport = true; }; libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; @@ -53,8 +54,6 @@ let 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; diff --git a/pkgs/development/libraries/clutter-gst/3.0.nix b/pkgs/development/libraries/clutter-gst/3.0.nix deleted file mode 100644 index c2bec3a7f1d..00000000000 --- a/pkgs/development/libraries/clutter-gst/3.0.nix +++ /dev/null @@ -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 - }; -} diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/pkgs/development/libraries/clutter-gst/default.nix index 7cef673dbc6..c2bec3a7f1d 100644 --- a/pkgs/development/libraries/clutter-gst/default.nix +++ b/pkgs/development/libraries/clutter-gst/default.nix @@ -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 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 06f4ac09436..662afdb8e1d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7255,10 +7255,8 @@ in 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 { };