alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

* Gnome-vfs updated to 2.4.2 to fix a gcc 3.4 incompatibility.

Browse source 
svn path=/nixpkgs/trunk/; revision=1481
This commit is contained in:
Eelco Dolstra 2004-09-21 15:26:42 +00:00
parent 92c40ea0d8
commit 9d688e90a2
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/development/libraries/gnome/default.nix
View file

@ -1,5 +1,6 @@
{ stdenv, fetchurl, pkgconfig, audiofile, gtkLibs { stdenv, fetchurl, pkgconfig, audiofile, gtkLibs
, flex, bison, popt, perl, zlib, libxml2, bzip2 , flex, bison, popt, perl, zlib, libxml2, bzip2
, perlXMLParser
}: }:
rec { rec {
@ -36,7 +37,7 @@ rec {
gnomevfs = (import ./gnome-vfs) { gnomevfs = (import ./gnome-vfs) {
inherit fetchurl stdenv pkgconfig perl glib libxml2 GConf inherit fetchurl stdenv pkgconfig perl glib libxml2 GConf
libbonobo gnomemimedata popt bzip2; libbonobo gnomemimedata popt bzip2 perlXMLParser;
# !!! use stdenv.bzip2 # !!! use stdenv.bzip2
}; };

14
pkgs/development/libraries/gnome/gnome-vfs/default.nix
View file

@ -1,15 +1,19 @@
{ stdenv, fetchurl, pkgconfig, perl, glib, libxml2, GConf { stdenv, fetchurl, pkgconfig, perl, glib, libxml2, GConf
, libbonobo, gnomemimedata, popt, bzip2 }: , libbonobo, gnomemimedata, popt, bzip2, perlXMLParser }:
assert pkgconfig != null && perl != null && glib != null assert pkgconfig != null && perl != null && glib != null
&& libxml2 != null && GConf != null && libbonobo != null && libxml2 != null && GConf != null && libbonobo != null
&& gnomemimedata != null && bzip2 != null; && gnomemimedata != null && bzip2 != null;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "gnome-vfs-2.4.1"; name = "gnome-vfs-2.4.2";
src = fetchurl { src = fetchurl {
url = ftp://ftp.gnome.org/pub/gnome/sources/gnome-vfs/2.4/gnome-vfs-2.4.1.tar.bz2; url = ftp://ftp.gnome.org/pub/gnome/sources/gnome-vfs/2.4/gnome-vfs-2.4.2.tar.bz2;
md5 = "cb7a36076f6a65e40c7f540be3057310"; md5 = "a0f0e40739214143bbf3050311ff10cd";
}; };
buildInputs = [pkgconfig perl glib libxml2 GConf libbonobo gnomemimedata popt bzip2]; buildInputs = [
pkgconfig perl glib libxml2 GConf libbonobo
gnomemimedata popt bzip2 perlXMLParser
];
PERL5LIB = perlXMLParser ~ "/lib/site_perl";
} }