summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2017-09-05 00:01:10 +0200
committerlassulus <lassulus@lassul.us>2017-09-06 11:05:45 +0200
commit5964b74a65f605e63b2cfa1cc2b8f1d85ea90d74 (patch)
tree8bb41ce5126fa61bc31ad3292f9640a1e330c67b
parent0703c8a41d010ecb6636d91e3cf40152ac81b8c8 (diff)
ma drozer: re-enable with protbuf3_2
-rw-r--r--makefu/2configs/tools/android-pentest.nix3
-rw-r--r--makefu/5pkgs/drozer/default.nix3
2 files changed, 3 insertions, 3 deletions
diff --git a/makefu/2configs/tools/android-pentest.nix b/makefu/2configs/tools/android-pentest.nix
index dec2b034b..da8a357ae 100644
--- a/makefu/2configs/tools/android-pentest.nix
+++ b/makefu/2configs/tools/android-pentest.nix
@@ -5,8 +5,7 @@
mitmproxy
nmap
msf
- ## broken due to protobuf
- # drozer
+ drozer
dex2jar
apktool
jd-gui
diff --git a/makefu/5pkgs/drozer/default.nix b/makefu/5pkgs/drozer/default.nix
index c63f1d0d8..f91d5b984 100644
--- a/makefu/5pkgs/drozer/default.nix
+++ b/makefu/5pkgs/drozer/default.nix
@@ -5,9 +5,10 @@ pythonPackages.buildPythonApplication rec {
version = "2.4.3";
buildInputs = [ jdk7 ];
propagatedBuildInputs = with pythonPackages; [
- protobuf
+ protobuf3_2
pyopenssl
pyyaml
+ ] ++ [
jre7
twisted
];