diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2005-10-04 14:24:19 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2005-10-04 14:24:19 +0000 |
| commit | bdabd66a464f87e7f4ab4d2aea9ab36944cf4510 (patch) | |
| tree | db39976f8b0b811cc2e766ad4270858e53be7fe9 /pkgs/development/tools/misc/texinfo | |
| parent | 5573610e012a4666117851e12c7e8eb4e5aa00c1 (diff) | |
| download | nixlib-bdabd66a464f87e7f4ab4d2aea9ab36944cf4510.tar nixlib-bdabd66a464f87e7f4ab4d2aea9ab36944cf4510.tar.gz nixlib-bdabd66a464f87e7f4ab4d2aea9ab36944cf4510.tar.bz2 nixlib-bdabd66a464f87e7f4ab4d2aea9ab36944cf4510.tar.lz nixlib-bdabd66a464f87e7f4ab4d2aea9ab36944cf4510.tar.xz nixlib-bdabd66a464f87e7f4ab4d2aea9ab36944cf4510.tar.zst nixlib-bdabd66a464f87e7f4ab4d2aea9ab36944cf4510.zip | |
* Install ncurses header files in $out/include, not
$out/include/ncurses. This simplifies many builders. svn path=/nixpkgs/trunk/; revision=4008
Diffstat (limited to 'pkgs/development/tools/misc/texinfo')
| -rw-r--r-- | pkgs/development/tools/misc/texinfo/builder.sh | 8 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/texinfo/default.nix | 11 |
2 files changed, 4 insertions, 15 deletions
diff --git a/pkgs/development/tools/misc/texinfo/builder.sh b/pkgs/development/tools/misc/texinfo/builder.sh deleted file mode 100644 index 0a24647bf81c..000000000000 --- a/pkgs/development/tools/misc/texinfo/builder.sh +++ /dev/null @@ -1,8 +0,0 @@ -buildinputs="$ncurses" -. $stdenv/setup - -tar xvfz $src -cd texinfo-* -./configure --prefix=$out -make -make install diff --git a/pkgs/development/tools/misc/texinfo/default.nix b/pkgs/development/tools/misc/texinfo/default.nix index 8f69b793b9a7..e10bc71a553c 100644 --- 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]; } |