diff options
| author | John Wiegley <johnw@newartisans.com> | 2015-03-31 15:51:43 -0500 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2015-03-31 15:51:43 -0500 |
| commit | 3b83bf60ae0d9e7363d68314324396db6e6746ff (patch) | |
| tree | d6756f08effd39465991564744765f961d01a6cf | |
| parent | dda963caf1ec2bb91b04f1c46ce1d5f8a8b477f4 (diff) | |
| parent | 227ebdc7cb5639398f632f042bdedbcdd7e31615 (diff) | |
| download | nixpkgs-3b83bf60ae0d9e7363d68314324396db6e6746ff.tar nixpkgs-3b83bf60ae0d9e7363d68314324396db6e6746ff.tar.gz nixpkgs-3b83bf60ae0d9e7363d68314324396db6e6746ff.tar.bz2 nixpkgs-3b83bf60ae0d9e7363d68314324396db6e6746ff.tar.lz nixpkgs-3b83bf60ae0d9e7363d68314324396db6e6746ff.tar.xz nixpkgs-3b83bf60ae0d9e7363d68314324396db6e6746ff.tar.zst nixpkgs-3b83bf60ae0d9e7363d68314324396db6e6746ff.zip | |
Merge pull request #7107 from jwiegley/t/global-ctags
Enable two modern features of GNU global
| -rw-r--r-- | pkgs/development/tools/misc/global/default.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index e6169c48a44..b1e43597a27 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, libtool, ncurses }: +{ fetchurl, stdenv, libtool, ncurses, ctags, sqlite, pythonPackages }: stdenv.mkDerivation rec { name = "global-6.3.4"; @@ -9,12 +9,15 @@ stdenv.mkDerivation rec { }; buildInputs = [ libtool ncurses ]; + propagatedBuildInputs = [ pythonPackages.pygments ]; configurePhase = '' ./configure --prefix="$out" --disable-static '' + ''--with-posix-sort=$(type -p sort) '' + ''--with-ltdl-include=${libtool}/include --with-ltdl-lib=${libtool}/lib '' - + ''--with-ncurses=${ncurses}''; + + ''--with-ncurses=${ncurses}'' + + ''--with-sqlite3=${sqlite}'' + + ''--with-exuberant-ctags=${ctags}/bin/ctags''; doCheck = true; |