diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-11-14 11:16:54 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-11-14 11:16:54 +0000 |
commit | bf1625e3f69e884db0a6b3ec69f98bb87db88806 (patch) | |
tree | 95335b8bd0a45f5ef44c82e4f51ae7cb9b530629 /pkgs | |
parent | 4ac5792c71c871beda86c79aa68bef9bc0aba295 (diff) |
* Cleanup plus a purity fix (don't look in /usr for libraries).
svn path=/nixpkgs/trunk/; revision=13290
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/networking/browsers/w3m/bsd.patch | 37 | ||||
-rw-r--r-- | pkgs/applications/networking/browsers/w3m/builder.sh | 5 | ||||
-rw-r--r-- | pkgs/applications/networking/browsers/w3m/default.nix | 22 |
3 files changed, 13 insertions, 51 deletions
diff --git a/pkgs/applications/networking/browsers/w3m/bsd.patch b/pkgs/applications/networking/browsers/w3m/bsd.patch deleted file mode 100644 index 9ea117187e93b..0000000000000 --- a/pkgs/applications/networking/browsers/w3m/bsd.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -rc w3m-0.5.1-orig/configure w3m-0.5.1/configure -*** w3m-0.5.1-orig/configure 2004-04-28 20:19:24.000000000 +0200 ---- w3m-0.5.1/configure 2005-09-16 11:33:48.000000000 +0200 -*************** -*** 5642,5648 **** - echo "$as_me:$LINENO: checking for -l$lib" >&5 - echo $ECHO_N "checking for -l$lib... $ECHO_C" >&6 - extlib="not found" -! for dir in /lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib - do - if test -f $dir/lib$lib.a -o -f $dir/lib$lib.so ; then - LIBS="$LIBS -l$lib" ---- 5642,5648 ---- - echo "$as_me:$LINENO: checking for -l$lib" >&5 - echo $ECHO_N "checking for -l$lib... $ECHO_C" >&6 - extlib="not found" -! for dir in /no-such-path - do - if test -f $dir/lib$lib.a -o -f $dir/lib$lib.so ; then - LIBS="$LIBS -l$lib" -*************** -*** 5768,5774 **** - if test x"$enable_ipv6" = xno; then - echo "$as_me:$LINENO: checking for libinet6" >&5 - echo $ECHO_N "checking for libinet6... $ECHO_C" >&6 -! for dir in /usr/local/v6/lib /usr/local/lib /usr/lib - do - if test -f $dir/libinet6.a; then - if test $dir != "/usr/lib"; then ---- 5768,5774 ---- - if test x"$enable_ipv6" = xno; then - echo "$as_me:$LINENO: checking for libinet6" >&5 - echo $ECHO_N "checking for libinet6... $ECHO_C" >&6 -! for dir in /no-such-path - do - if test -f $dir/libinet6.a; then - if test $dir != "/usr/lib"; then diff --git a/pkgs/applications/networking/browsers/w3m/builder.sh b/pkgs/applications/networking/browsers/w3m/builder.sh deleted file mode 100644 index 5a28940f4a669..0000000000000 --- a/pkgs/applications/networking/browsers/w3m/builder.sh +++ /dev/null @@ -1,5 +0,0 @@ -source $stdenv/setup - -configureFlags="--with-ssl=$openssl --with-gc=$boehmgc $configureFlags" - -genericBuild diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix index 1cda828cf5312..0298ca3d3dcdb 100644 --- a/pkgs/applications/networking/browsers/w3m/default.nix +++ b/pkgs/applications/networking/browsers/w3m/default.nix @@ -9,20 +9,24 @@ assert graphicsSupport -> gdkpixbuf != null; stdenv.mkDerivation { name = "w3m-0.5.2"; - builder = ./builder.sh; + src = fetchurl { url = mirror://sourceforge/w3m/w3m-0.5.2.tar.gz; md5 = "ba06992d3207666ed1bf2dcf7c72bf58"; }; - inherit openssl boehmgc; - buildInputs = [ - ncurses boehmgc gettext zlib - (if sslSupport then openssl else null) - (if graphicsSupport then gdkpixbuf else null) - ]; - #patches = [./bsd.patch]; + + buildInputs = [ncurses boehmgc gettext zlib] + ++ stdenv.lib.optional sslSupport openssl + ++ stdenv.lib.optional graphicsSupport gdkpixbuf; + + configureFlags = "--with-ssl=${openssl} --with-gc=${boehmgc}"; + + preConfigure = '' + substituteInPlace ./configure --replace /usr /no-such-path + ''; meta = { - homepage = http://w3m.sourceforge.net; + homepage = http://w3m.sourceforge.net/; + description = "A text-mode web browser"; }; } |