From 17257424b1708f8e2cadae617216411bd6608eb8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 17 Oct 2004 13:11:44 +0000 Subject: [PATCH] * Install header files again, they're needed to build plugins. svn path=/nixpkgs/trunk/; revision=1563 --- pkgs/applications/networking/browsers/firefox/builder.sh | 2 +- pkgs/applications/networking/browsers/firefox/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/builder.sh b/pkgs/applications/networking/browsers/firefox/builder.sh index b025a71d425..bc484e9c7aa 100644 --- a/pkgs/applications/networking/browsers/firefox/builder.sh +++ b/pkgs/applications/networking/browsers/firefox/builder.sh @@ -26,7 +26,7 @@ postInstall() { strip -S $out/lib/*/* || true # We don't need this (do we?) - rm -rf $out/include +# rm -rf $out/include # This fixes starting Firefox when there already is a running # instance. The `firefox' wrapper script actually expects to be diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index f100b270f94..3b160021c88 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -2,7 +2,7 @@ # !!! assert libIDL.glib == gtk.glib; -stdenv.mkDerivation { +(stdenv.mkDerivation { name = "firefox-1.0pre-PR-0.10.1"; builder = ./builder.sh; @@ -14,4 +14,4 @@ stdenv.mkDerivation { buildInputs = [pkgconfig gtk perl zip libIDL libXi]; patches = [./writable-copies.patch]; -} +}) // {inherit gtk;} \ No newline at end of file