Author: urkud
Date: Sat Oct 8 14:08:44 2011
New Revision: 29720
URL: https://nixos.org/websvn/nix/?rev=29720&sc=1
Log:
libgnome-2.32.1, drop esound dependency
Modified:
nixpkgs/trunk/pkgs/desktops/gnome-2.28/default.nix
nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/libgnome/default.nix
Modified: nixpkgs/trunk/pkgs/desktops/gnome-2.28/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/gnome-2.28/default.nix Sat Oct 8 14:08:39
2011 (r29719)
+++ nixpkgs/trunk/pkgs/desktops/gnome-2.28/default.nix Sat Oct 8 14:08:44
2011 (r29720)
@@ -112,9 +112,9 @@
};
libgnome = import ./platform/libgnome {
- inherit (pkgs) stdenv fetchurl pkgconfig popt zlib;
+ inherit (pkgs) stdenv fetchurl_gnome libcanberra pkgconfig popt zlib
libtool;
inherit (pkgs.gtkLibs) glib;
- inherit intltool esound libbonobo GConf gnome_vfs ORBit2;
+ inherit intltool libbonobo GConf gnome_vfs ORBit2;
};
libgnomeui = import ./platform/libgnomeui {
Modified: nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/libgnome/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/libgnome/default.nix
Sat Oct 8 14:08:39 2011 (r29719)
+++ nixpkgs/trunk/pkgs/desktops/gnome-2.28/platform/libgnome/default.nix
Sat Oct 8 14:08:44 2011 (r29720)
@@ -1,14 +1,16 @@
-{ stdenv, fetchurl, pkgconfig, glib, popt, zlib
-, intltool, esound, libbonobo, GConf, gnome_vfs, ORBit2}:
+{ stdenv, fetchurl_gnome, pkgconfig, glib, popt, zlib, libcanberra
+, intltool, libbonobo, GConf, gnome_vfs, ORBit2, libtool}:
-stdenv.mkDerivation {
- name = "libgnome-2.28.0";
+stdenv.mkDerivation rec {
+ name = src.pkgname;
- src = fetchurl {
- url = mirror://gnome/sources/libgnome/2.28/libgnome-2.28.0.tar.bz2;
- sha256 = "03hc1m88swxxw4cq491kz7495ksv762imamzbbvhci41bc40anwv";
+ src = fetchurl_gnome {
+ project = "libgnome";
+ major = "2"; minor = "32"; patchlevel = "1";
+ sha256 = "197pnq8y0knqjhm2fg4j6hbqqm3qfzfnd0irhwxpk1b4hqb3kimj";
};
- buildInputs = [ pkgconfig popt zlib intltool GConf gnome_vfs ];
- propagatedBuildInputs = [ glib libbonobo esound ];
+ buildNativeInputs = [ pkgconfig ];
+ buildInputs = [ popt zlib intltool GConf gnome_vfs libcanberra libtool ];
+ propagatedBuildInputs = [ glib libbonobo ];
}
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
