* Install ncurses header files in $out/include, not

$out/include/ncurses. This simplifies many builders. svn path=/nixpkgs/trunk/; revision=4008
2005-10-04 14:24:19 +00:00
parent 5573610e01
commit bdabd66a46
16 changed files with 15 additions and 52 deletions
--- a/pkgs/development/tools/misc/texinfo/builder.sh
+++ b/pkgs/development/tools/misc/texinfo/builder.sh
@@ -1,8 +0,0 @@
-buildinputs="$ncurses"
-. $stdenv/setup
-
-tar xvfz $src
-cd texinfo-*
-./configure --prefix=$out
-make
-make install
--- a/pkgs/development/tools/misc/texinfo/default.nix
+++ b/pkgs/development/tools/misc/texinfo/default.nix
@@ -1,13 +1,10 @@
 {stdenv, fetchurl, ncurses}:

-assert ncurses != null;
-
 stdenv.mkDerivation {
-  name = "texinfo-4.6";
-  builder = ./builder.sh;
+  name = "texinfo-4.8";
  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/texinfo-4.6.tar.gz;
-    md5 = "5730c8c0c7484494cca7a7e2d7459c64";
+    url = http://ftp.gnu.org/gnu/texinfo/texinfo-4.8.tar.bz2;
+    md5 = "6ba369bbfe4afaa56122e65b3ee3a68c";
  };
-  inherit ncurses;
+  buildInputs = [ncurses];
 }