diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2011-10-08 14:08:44 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2011-10-08 14:08:44 +0000 |
| commit | a2d0e3b73923e6c1c02862c1ea9eeaf590d1412a (patch) | |
| tree | 83ee7db18b7a1e540c3fccbd7972bb1816508270 | |
| parent | 0ba5532d4be027d98cb74cd8d500cfb8ef3806e9 (diff) | |
| download | nixlib-a2d0e3b73923e6c1c02862c1ea9eeaf590d1412a.tar nixlib-a2d0e3b73923e6c1c02862c1ea9eeaf590d1412a.tar.gz nixlib-a2d0e3b73923e6c1c02862c1ea9eeaf590d1412a.tar.bz2 nixlib-a2d0e3b73923e6c1c02862c1ea9eeaf590d1412a.tar.lz nixlib-a2d0e3b73923e6c1c02862c1ea9eeaf590d1412a.tar.xz nixlib-a2d0e3b73923e6c1c02862c1ea9eeaf590d1412a.tar.zst nixlib-a2d0e3b73923e6c1c02862c1ea9eeaf590d1412a.zip | |
libgnome-2.32.1, drop esound dependency
svn path=/nixpkgs/trunk/; revision=29720
| -rw-r--r-- | pkgs/desktops/gnome-2.28/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-2.28/platform/libgnome/default.nix | 20 |
2 files changed, 13 insertions, 11 deletions
diff --git a/pkgs/desktops/gnome-2.28/default.nix b/pkgs/desktops/gnome-2.28/default.nix index 7516b53bc728..432535e5595a 100644 --- a/pkgs/desktops/gnome-2.28/default.nix +++ b/pkgs/desktops/gnome-2.28/default.nix @@ -112,9 +112,9 @@ pkgs.makeOverridable }; 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 { diff --git a/pkgs/desktops/gnome-2.28/platform/libgnome/default.nix b/pkgs/desktops/gnome-2.28/platform/libgnome/default.nix index c79a61b883a3..76f213b5fa89 100644 --- a/pkgs/desktops/gnome-2.28/platform/libgnome/default.nix +++ b/pkgs/desktops/gnome-2.28/platform/libgnome/default.nix @@ -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 ]; } |