From b3c93a41c1e44a533d4bd8ca287d0c3da1f4dc20 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 31 Mar 2004 09:45:19 +0000 Subject: [PATCH] * 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 --- pkgs/applications/networking/browsers/firefox/default.nix | 4 ++-- 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 f02ebd95a06..7a8080ad3d5 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 b00c0215cac..a8fc2352355 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]; }