From 7a51e5f4167753eddb843c98a3a938966d30821c Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Wed, 10 Dec 2014 04:14:11 -0600 Subject: [PATCH] nixpkgs: fix tor-arm dependencies Signed-off-by: Austin Seipp --- pkgs/tools/security/tor/tor-arm.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/tor/tor-arm.nix b/pkgs/tools/security/tor/tor-arm.nix index e6d6ae69d10..a36e53c0652 100644 --- a/pkgs/tools/security/tor/tor-arm.nix +++ b/pkgs/tools/security/tor/tor-arm.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, python, setuptools, lsof, nettools, makeWrapper }: +{ stdenv, fetchurl, python, setuptools, lsof, nettools, makeWrapper +, pythonPackages, ncurses }: stdenv.mkDerivation rec { name = "tor-arm-${version}"; @@ -9,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1yi87gdglkvi1a23hv5c3k7mc18g0rw7b05lfcw81qyxhlapf3pw"; }; - buildInputs = [ python setuptools lsof nettools makeWrapper ]; + buildInputs = + [ python pythonPackages.curses setuptools lsof nettools makeWrapper ]; patchPhase = '' substituteInPlace ./setup.py --replace "/usr/bin" "$out/bin" @@ -34,7 +36,9 @@ stdenv.mkDerivation rec { for i in $(cd $out/bin && ls); do wrapProgram $out/bin/$i \ - --prefix PYTHONPATH : "$(toPythonPath $out):$out/libexec:$PYTHONPATH" + --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pythonPackages.curses}):$out/libexec:$PYTHONPATH" \ + --set TERMINFO "${ncurses}/share/terminfo" \ + --set TERM "xterm" done '';