JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tor-arm: use python2

Browse Source
This commit is contained in:
Frederik Rietdijk 2016-11-09 13:49:06 +01:00
parent 3ebca4f4cf
commit 09a5864d28
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/security/tor/tor-arm.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, makeWrapper { stdenv, fetchurl, makeWrapper
, pythonPackages, ncurses, lsof, nettools , python2Packages, ncurses, lsof, nettools
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1yi87gdglkvi1a23hv5c3k7mc18g0rw7b05lfcw81qyxhlapf3pw"; sha256 = "1yi87gdglkvi1a23hv5c3k7mc18g0rw7b05lfcw81qyxhlapf3pw";
}; };
nativeBuildInputs = [ makeWrapper pythonPackages.python ]; nativeBuildInputs = [ makeWrapper python2Packages.python ];
outputs = [ "out" "man" ]; outputs = [ "out" "man" ];
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
--replace "lsof -wnPi" "${lsof}/bin/lsof" --replace "lsof -wnPi" "${lsof}/bin/lsof"
substituteInPlace ./arm --replace '"$0" = /usr/bin/arm' 'true' substituteInPlace ./arm --replace '"$0" = /usr/bin/arm' 'true'
substituteInPlace ./arm --replace "python" "${pythonPackages.python}/bin/python" substituteInPlace ./arm --replace "python" "${python2Packages.python}/bin/python"
for i in ./install ./arm ./src/gui/controller.py ./src/cli/wizard.py ./src/resources/torrcOverride/override.h ./src/resources/torrcOverride/override.py ./src/resources/arm.1 ./setup.py; do for i in ./install ./arm ./src/gui/controller.py ./src/cli/wizard.py ./src/resources/torrcOverride/override.h ./src/resources/torrcOverride/override.py ./src/resources/arm.1 ./setup.py; do
substituteInPlace $i --replace "/usr/share" "$out/share" substituteInPlace $i --replace "/usr/share" "$out/share"