diff options
author | lassulus <lass@blue.r> | 2018-09-04 20:53:12 +0200 |
---|---|---|
committer | lassulus <lass@blue.r> | 2018-09-04 20:53:12 +0200 |
commit | 96c4ab61202f515c7a361ef76c398e542771d6b4 (patch) | |
tree | ce2ca90d0ae800bb3ba3e1b05593e7ba7bef104c /makefu/5pkgs/drozer | |
parent | e183bb1c80c42131f9e3d932985e413ef457f77a (diff) | |
parent | 481376c1509661cbf1bdb17b9887b3a4f0487b6f (diff) |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/5pkgs/drozer')
-rw-r--r-- | makefu/5pkgs/drozer/default.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/makefu/5pkgs/drozer/default.nix b/makefu/5pkgs/drozer/default.nix index 3df67d07e..1f353e477 100644 --- a/makefu/5pkgs/drozer/default.nix +++ b/makefu/5pkgs/drozer/default.nix @@ -1,15 +1,16 @@ -{ pkgs, lib, fetchFromGitHub, pythonPackages, jre7, jdk7 }: +{ pkgs, lib, fetchFromGitHub, pythonPackages, jre, jdk }: pythonPackages.buildPythonApplication rec { name = "drozer-${version}"; version = "2.4.3"; - buildInputs = [ jdk7 ]; + buildInputs = [ jdk ]; propagatedBuildInputs = with pythonPackages; [ protobuf pyopenssl pyyaml + service-identity ] ++ [ - jre7 + jre twisted ]; src = fetchFromGitHub { @@ -19,7 +20,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "1z437y7rr53dhpi95yc2c3x8g4aix90y7zf52avcdsvhlp4iip3q"; }; prePatch = '' - sed -i 's#^exec java #exec ${jre7}/bin/java #' ./src/drozer/lib/dx + sed -i 's#^exec java #exec ${jre}/bin/java #' ./src/drozer/lib/dx patchShebangs ./src/drozer/lib/dx patchelf $(cat $NIX_CC/nix-support/dynamic-linker) ./src/drozer/lib/aapt echo starting build |