diff options
| author | tv <tv@krebsco.de> | 2018-09-06 23:10:09 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2018-09-06 23:10:09 +0200 |
| commit | 03764d6765f8d2734d0960bc75cc6856bf0893d8 (patch) | |
| tree | b8cbbdc3a0381b5d1b1d08149c38a6bd5be5e9c5 /makefu/5pkgs/drozer | |
| parent | 86466154f11748365cdab50b6ac113bdfd5542be (diff) | |
| parent | 96c4ab61202f515c7a361ef76c398e542771d6b4 (diff) | |
Merge remote-tracking branch 'prism/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 |