finally fixing netsurf

svn path=/nixpkgs/trunk/; revision=17328
This commit is contained in:
Marc Weber 2009-09-21 10:09:20 +00:00
parent db19c4e24e
commit c28aeffc87
3 changed files with 6 additions and 1 deletions

View File

@ -50,6 +50,8 @@ rec {
}; };
}; };
/*
# unfinished - experimental
libdom = stdenv.mkDerivation { libdom = stdenv.mkDerivation {
name = "libdom-devel"; name = "libdom-devel";
@ -65,6 +67,7 @@ rec {
platforms = lib.platforms.linux; platforms = lib.platforms.linux;
}; };
}; };
*/
netsurfHaru = import ./haru.nix { netsurfHaru = import ./haru.nix {
inherit fetchurl stdenv lib zlib libpng; inherit fetchurl stdenv lib zlib libpng;

View File

@ -17,6 +17,8 @@ stdenv.mkDerivation {
curl libpng libxml2 lcms glib libharu libmng curl libpng libxml2 lcms glib libharu libmng
gtk libglade libCSS]; gtk libglade libCSS];
installPhase = "make PREFIX=$out install";
meta = { meta = {
description = "free, open source web browser"; description = "free, open source web browser";
homepage = http://www.netsurf-browser.org; homepage = http://www.netsurf-browser.org;

View File

@ -7179,7 +7179,7 @@ let
}; };
netsurfBrowser = netsurf.browser; netsurfBrowser = netsurf.browser;
netsurf = import ../applications/networking/browsers/netsurf { inherit pkgs; }; netsurf = recurseIntoAttrs (import ../applications/networking/browsers/netsurf { inherit pkgs; });
nvi = import ../applications/editors/nvi { nvi = import ../applications/editors/nvi {
inherit fetchurl stdenv ncurses; inherit fetchurl stdenv ncurses;