From a7fc8ad140fdc95742b7a09e9e919ffc98112645 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 22 Jun 2018 16:40:19 -0400 Subject: androidndk: use unzip This is a free version and preferred to 7zip. --- pkgs/development/mobile/androidenv/androidndk.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/development/mobile') diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix index 7550830a4efd..3f9e53089c18 100644 --- a/pkgs/development/mobile/androidenv/androidndk.nix +++ b/pkgs/development/mobile/androidenv/androidndk.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, ncurses5, p7zip, lib, makeWrapper +{ stdenv, fetchurl, zlib, ncurses5, unzip, lib, makeWrapper , coreutils, file, findutils, gawk, gnugrep, gnused, jdk, which , platformTools, python3, libcxx, version, sha256 }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { phases = "buildPhase"; - nativeBuildInputs = [ p7zip makeWrapper file ]; + nativeBuildInputs = [ unzip makeWrapper file ]; buildCommand = let bin_path = "$out/bin"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { in '' mkdir -pv $out/libexec cd $out/libexec - 7z x $src + unzip -qq $src patchShebangs ${pkg_path} -- cgit 1.4.1