diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-03-31 09:45:19 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-03-31 09:45:19 +0000 |
| commit | b3c93a41c1e44a533d4bd8ca287d0c3da1f4dc20 (patch) | |
| tree | 7753866de874de6802481a5e69110646123df0be | |
| parent | 24cb251dd0911f019c86d65bc316298ca5624fd7 (diff) | |
* 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
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/freedesktop/libXt/default.nix | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index f02ebd95a0626..7a8080ad3d514 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -4,7 +4,7 @@ assert pkgconfig != null && gtk != null && perl != null && zip != null && libIDL != null; -assert libIDL.glib == gtk.glib; +# !!! assert libIDL.glib == gtk.glib; stdenv.mkDerivation { name = "firefox-0.8"; @@ -15,5 +15,5 @@ stdenv.mkDerivation { md5 = "cdc85152f4219bf3e3f1a8dc46e04654"; }; - buildInputs = [pkgconfig, gtk, perl, zip, libIDL]; + buildInputs = [pkgconfig gtk perl zip libIDL]; } diff --git a/pkgs/development/libraries/freedesktop/libXt/default.nix b/pkgs/development/libraries/freedesktop/libXt/default.nix index b00c0215caceb..a8fc2352355d2 100644 --- a/pkgs/development/libraries/freedesktop/libXt/default.nix +++ b/pkgs/development/libraries/freedesktop/libXt/default.nix @@ -6,7 +6,8 @@ stdenv.mkDerivation { url = http://freedesktop.org/~xlibs/release/xlibs-1.0/libXt-0.1.4.tar.bz2; md5 = "32b6528c9deb058d1a9ed17ffa848df8"; }; - buildInputs = [pkgconfig libX11 libSM patch]; + buildInputs = [pkgconfig libX11 patch]; + propagatedBuildInputs = [libSM]; # This patch should become unnecessary soon; already been fixed in CVS. patches = [./patch]; } |