* Some changes to get Firefox working (it doesn't work yet, since

the freedesktop.org libXt is broken, but never mind that).

svn path=/nixpkgs/trunk/; revision=885
This commit is contained in:
Eelco Dolstra 2004-03-31 09:45:19 +00:00
parent 24cb251dd0
commit b3c93a41c1
2 changed files with 4 additions and 3 deletions

View file

@ -4,7 +4,7 @@
assert pkgconfig != null && gtk != null && perl != null assert pkgconfig != null && gtk != null && perl != null
&& zip != null && libIDL != null; && zip != null && libIDL != null;
assert libIDL.glib == gtk.glib; # !!! assert libIDL.glib == gtk.glib;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "firefox-0.8"; name = "firefox-0.8";
@ -15,5 +15,5 @@ stdenv.mkDerivation {
md5 = "cdc85152f4219bf3e3f1a8dc46e04654"; md5 = "cdc85152f4219bf3e3f1a8dc46e04654";
}; };
buildInputs = [pkgconfig, gtk, perl, zip, libIDL]; buildInputs = [pkgconfig gtk perl zip libIDL];
} }

View file

@ -6,7 +6,8 @@ stdenv.mkDerivation {
url = http://freedesktop.org/~xlibs/release/xlibs-1.0/libXt-0.1.4.tar.bz2; url = http://freedesktop.org/~xlibs/release/xlibs-1.0/libXt-0.1.4.tar.bz2;
md5 = "32b6528c9deb058d1a9ed17ffa848df8"; md5 = "32b6528c9deb058d1a9ed17ffa848df8";
}; };
buildInputs = [pkgconfig libX11 libSM patch]; buildInputs = [pkgconfig libX11 patch];
propagatedBuildInputs = [libSM];
# This patch should become unnecessary soon; already been fixed in CVS. # This patch should become unnecessary soon; already been fixed in CVS.
patches = [./patch]; patches = [./patch];
} }