diff options
author | Pascal Wittmann <PascalWittmann@gmx.net> | 2015-05-11 21:15:38 +0200 |
---|---|---|
committer | Pascal Wittmann <PascalWittmann@gmx.net> | 2015-05-11 21:15:38 +0200 |
commit | a16cd707bd451ffd7e3414a54352f5e0f5c6d165 (patch) | |
tree | 5e8280d84864460d89e5aba4705614df9c7833d0 /pkgs/development/tools | |
parent | 6a95cd085f8d7229e8b161d182d5f69acd291a84 (diff) | |
parent | b8f1d6c9dbc456930ac33347c01f789c0525e70a (diff) | |
download | nixlib-a16cd707bd451ffd7e3414a54352f5e0f5c6d165.tar nixlib-a16cd707bd451ffd7e3414a54352f5e0f5c6d165.tar.gz nixlib-a16cd707bd451ffd7e3414a54352f5e0f5c6d165.tar.bz2 nixlib-a16cd707bd451ffd7e3414a54352f5e0f5c6d165.tar.lz nixlib-a16cd707bd451ffd7e3414a54352f5e0f5c6d165.tar.xz nixlib-a16cd707bd451ffd7e3414a54352f5e0f5c6d165.tar.zst nixlib-a16cd707bd451ffd7e3414a54352f5e0f5c6d165.zip |
Merge pull request #7804 from codyopel/global
global: refactor
Diffstat (limited to 'pkgs/development/tools')
-rw-r--r-- | pkgs/development/tools/misc/global/default.nix | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index 7b61d96e3e7e..0fa547097885 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -1,5 +1,6 @@ -{ fetchurl, stdenv, libtool, ncurses, ctags, sqlite -, pythonPackages, makeWrapper }: +{ fetchurl, stdenv, libtool, makeWrapper +, coreutils, ctags, ncurses, pythonPackages, sqlite, pkgconfig +}: stdenv.mkDerivation rec { name = "global-6.4"; @@ -9,16 +10,20 @@ stdenv.mkDerivation rec { sha256 = "13i4zwx6gaibc4j79wd0hgxysw8ibxz9c018zxhydnxlyadzcnri"; }; - buildInputs = [ libtool ncurses makeWrapper ]; + nativeBuildInputs = [ libtool makeWrapper ]; + + buildInputs = [ 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-sqlite3=${sqlite} '' - + ''--with-exuberant-ctags=${ctags}/bin/ctags''; + configureFlags = [ + "--with-ltdl-include=${libtool}/include" + "--with-ltdl-lib=${libtool}/lib" + "--with-ncurses=${ncurses}" + "--with-sqlite3=${sqlite}" + "--with-exuberant-ctags=${ctags}/bin/ctags" + "--with-posix-sort=${coreutils}/bin/sort" + ]; doCheck = true; @@ -34,7 +39,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Source code tag system"; - longDescription = '' GNU GLOBAL is a source code tagging system that works the same way across diverse environments (Emacs, vi, less, Bash, web browser, etc). @@ -45,11 +49,8 @@ stdenv.mkDerivation rec { independence of any editor. It runs on a UNIX (POSIX) compatible operating system like GNU and BSD. ''; - - license = licenses.gpl3Plus; - homepage = http://www.gnu.org/software/global/; - + license = licenses.gpl3Plus; maintainers = with maintainers; [ pSub ]; platforms = platforms.unix; }; |