From b6932f56f8b997379ddde804f35da2c9da32536b Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Tue, 31 Mar 2015 08:36:19 -0500 Subject: [PATCH 1/3] Enable two modern features of GNU global --- pkgs/development/tools/misc/global/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index e6169c48a44..86856ab8d59 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"; @@ -14,7 +14,9 @@ stdenv.mkDerivation rec { '' ./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; From 65b4013194b99c60f26fdaee6d7d26050d30f06f Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Tue, 31 Mar 2015 10:31:58 -0500 Subject: [PATCH 2/3] Add propagatedBuildInputs --- pkgs/development/tools/misc/global/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index 86856ab8d59..fe119b266b5 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -9,6 +9,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libtool ncurses ]; + propagatedBuildInputs = [ libtool ncurses pythonPackages.pygments ]; configurePhase = '' ./configure --prefix="$out" --disable-static '' From 227ebdc7cb5639398f632f042bdedbcdd7e31615 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Tue, 31 Mar 2015 10:34:22 -0500 Subject: [PATCH 3/3] Remove unnecessary entries in propagatedBuildInputs --- pkgs/development/tools/misc/global/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index fe119b266b5..b1e43597a27 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libtool ncurses ]; - propagatedBuildInputs = [ libtool ncurses pythonPackages.pygments ]; + propagatedBuildInputs = [ pythonPackages.pygments ]; configurePhase = '' ./configure --prefix="$out" --disable-static ''