public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Making cdecl compile with readline.

Browse Source 
svn path=/nixpkgs/trunk/; revision=14941
This commit is contained in:
Lluís Batlle i Rossell 2009-04-08 10:09:14 +00:00
parent 5ebbf90878
commit 8ddd79ca2e
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/tools/cdecl/cdecl-2.5.patch
View File

@ -7,10 +7,10 @@ index 9e85686..b8e6e02 100644
# add -DUSE_READLINE To compile in support for the GNU readline library. # add -DUSE_READLINE To compile in support for the GNU readline library.
-CFLAGS= -s -O2 -DUSE_READLINE -CFLAGS= -s -O2 -DUSE_READLINE
+ +CFLAGS=-DUSE_READLINE
CC= gcc CC= gcc
-LIBS= -lreadline -ltermcap -LIBS= -lreadline -ltermcap
+ +LIBS= -lreadline -lncursesw
ALLFILES= makefile cdgram.y cdlex.l cdecl.c cdecl.1 testset testset++ ALLFILES= makefile cdgram.y cdlex.l cdecl.c cdecl.1 testset testset++
-BINDIR= /usr/bin -BINDIR= /usr/bin
-MANDIR= /usr/man/man1 -MANDIR= /usr/man/man1

4
pkgs/development/tools/cdecl/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, yacc, flex, readline}: {stdenv, fetchurl, yacc, flex, readline, ncurses}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "cdecl-2.5"; name = "cdecl-2.5";
@ -11,7 +11,7 @@ stdenv.mkDerivation {
preBuild = " preBuild = "
makeFlags=\"PREFIX=$out\" makeFlags=\"PREFIX=$out\"
"; ";
buildInputs = [yacc flex readline]; buildInputs = [yacc flex readline ncurses];
meta = { meta = {
description = "Translator English -- C/C++ declarations"; description = "Translator English -- C/C++ declarations";

2
pkgs/top-level/all-packages.nix
View File

@ -480,7 +480,7 @@ let
}; };
cdecl = import ../development/tools/cdecl { cdecl = import ../development/tools/cdecl {
inherit fetchurl stdenv yacc flex readline; inherit fetchurl stdenv yacc flex readline ncurses;
}; };
cdrdao = import ../tools/cd-dvd/cdrdao { cdrdao = import ../tools/cd-dvd/cdrdao {