diff options
author | Austin Seipp <aseipp@pobox.com> | 2014-06-03 20:37:30 -0500 |
---|---|---|
committer | Austin Seipp <aseipp@pobox.com> | 2014-06-03 20:37:30 -0500 |
commit | ec1eadf5a08e8bb13f4dbaacde478f46f612fc42 (patch) | |
tree | d5d5b082f53a408309293fc99adf27c818ad7ddb /pkgs/development/tools/cdecl/default.nix | |
parent | a8ee945a134bb2f1ecb684ebd99f637dae347e00 (diff) | |
parent | d56dcb50f4764c84ec2309ba12978bd71adcd950 (diff) | |
download | nixlib-ec1eadf5a08e8bb13f4dbaacde478f46f612fc42.tar nixlib-ec1eadf5a08e8bb13f4dbaacde478f46f612fc42.tar.gz nixlib-ec1eadf5a08e8bb13f4dbaacde478f46f612fc42.tar.bz2 nixlib-ec1eadf5a08e8bb13f4dbaacde478f46f612fc42.tar.lz nixlib-ec1eadf5a08e8bb13f4dbaacde478f46f612fc42.tar.xz nixlib-ec1eadf5a08e8bb13f4dbaacde478f46f612fc42.tar.zst nixlib-ec1eadf5a08e8bb13f4dbaacde478f46f612fc42.zip |
Merge pull request #2691 from joelteon/cdecl-osx
Update cdecl to block-supporting version
Diffstat (limited to 'pkgs/development/tools/cdecl/default.nix')
-rw-r--r-- | pkgs/development/tools/cdecl/default.nix | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/pkgs/development/tools/cdecl/default.nix b/pkgs/development/tools/cdecl/default.nix index a9eb323f9a83..d923fea8b598 100644 --- a/pkgs/development/tools/cdecl/default.nix +++ b/pkgs/development/tools/cdecl/default.nix @@ -1,22 +1,25 @@ -{stdenv, fetchurl, yacc, flex, readline, ncurses}: +{stdenv, fetchurl, yacc, flex, readline, ncurses, gnused}: stdenv.mkDerivation { name = "cdecl-2.5"; src = fetchurl { - url = ftp://metalab.unc.edu/pub/linux/devel/lang/c/cdecl-2.5.tar.gz; - md5 = "29895dab52e85b2474a59449e07b7996"; + url = "http://cdecl.org/files/cdecl-blocks-2.5.tar.gz"; + md5 = "c1927e146975b1c7524cbaf07a7c10f8"; }; - patches = [ ./cdecl-2.5-implicit-pointer.patch ./cdecl-2.5.patch ./cdecl-2.5-gentoo.patch ]; - preBuild = " - makeFlags=\"PREFIX=$out\" - "; + patches = [ ./cdecl-2.5-lex.patch ]; + preBuild = '' + ${gnused}/bin/sed 's/getline/cdecl_getline/g' -i cdecl.c; + makeFlagsArray=(CFLAGS="-DBSD -DUSE_READLINE -std=gnu89" LIBS=-lreadline); + makeFlags="$makeFlags PREFIX=$out BINDIR=$out/bin MANDIR=$out/man1 CATDIR=$out/cat1"; + mkdir -p $out/bin; + ''; buildInputs = [yacc flex readline ncurses]; meta = { description = "Translator English -- C/C++ declarations"; license = "Public Domain"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + maintainers = with stdenv.lib.maintainers; [viric joelteon]; + platforms = stdenv.lib.platforms.unix; }; } |