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

Revert "clutter: update 1.18 -> 1.20. Shouldn't break anything"

Browse Source 
This reverts commit 5e14c86b80650575562a81d453fde7f080f82ca1.

Overlooked an experimental API that breaks mutter in GNOME 3.12.
This commit is contained in:
Luca Bruno 2014-11-17 15:10:56 +01:00
parent 5e14c86b80
commit 24ad1612b4
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/desktops/gnome-3/3.12/default.nix
View File

@ -3,7 +3,7 @@
rec { rec {
inherit (pkgs) glib gtk2 gtk3 gnome2; inherit (pkgs) glib gtk2 gtk3 gnome2;
gnome3 = pkgs.gnome3_12 // { recurseForDerivations = false; }; gnome3 = pkgs.gnome3_12 // { recurseForDerivations = false; };
clutter = pkgs.clutter_1_20; clutter = pkgs.clutter_1_18;
clutter_gtk = pkgs.clutter_gtk.override { inherit clutter; }; clutter_gtk = pkgs.clutter_gtk.override { inherit clutter; };
clutter-gst = pkgs.clutter-gst.override { inherit clutter; }; clutter-gst = pkgs.clutter-gst.override { inherit clutter; };
upower = pkgs.upower_99; upower = pkgs.upower_99;

8
pkgs/development/libraries/clutter/1.20.nix → pkgs/development/libraries/clutter/1.18.nix
View File

@ -4,15 +4,15 @@ gobjectIntrospection
}: }:
let let
ver_maj = "1.20"; ver_maj = "1.18";
ver_min = "0"; ver_min = "2";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "clutter-${ver_maj}.${ver_min}"; name = "clutter-${ver_maj}.${ver_min}";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/clutter/${ver_maj}/${name}.tar.xz"; url = "mirror://gnome/sources/clutter/${ver_maj}/${name}.tar.xz";
sha256 = "cc940809e6e1469ce349c4bddb0cbcc2c13c087d4fc15cda9278d855ee2d1293"; sha256 = "f9fe12e6148426063c90e67dfaeb56013bf1aea224ef502223d13eab6c1add63";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.lgpl2Plus; license = stdenv.lib.licenses.lgpl2Plus;
homepage = http://www.clutter-project.org/; homepage = http://www.clutter-project.org/;
maintainers = with stdenv.lib.maintainers; [ urkud lethalman ]; maintainers = with stdenv.lib.maintainers; [ urkud ];
platforms = stdenv.lib.platforms.mesaPlatforms; platforms = stdenv.lib.platforms.mesaPlatforms;
}; };
} }

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

@ -4926,7 +4926,7 @@ let
clutter = callPackage ../development/libraries/clutter { }; clutter = callPackage ../development/libraries/clutter { };
clutter_1_20 = callPackage ../development/libraries/clutter/1.20.nix { clutter_1_18 = callPackage ../development/libraries/clutter/1.18.nix {
cogl = cogl_1_18; cogl = cogl_1_18;
}; };