From e1e9b197f9749b28b31cbb1e79465700dd89baaa Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 22 Jun 2018 17:49:28 -0400 Subject: [PATCH] android: fix from last output size reduction MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Directories weren’t being removed properly. --- pkgs/development/mobile/androidenv/androidndk.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix index cc46c1b2b99..3d0ef39df14 100644 --- a/pkgs/development/mobile/androidenv/androidndk.nix +++ b/pkgs/development/mobile/androidenv/androidndk.nix @@ -35,11 +35,6 @@ stdenv.mkDerivation rec { cd $out/libexec unzip -qq $src - # Steps to reduce output size - rm -rf docs sources tests - # We only support cross compiling with gcc for now - rm -rf toolchains/*-clang* toolchains/llvm-* - patchShebangs ${pkg_path} # so that it doesn't fail because of read-only permissions set @@ -60,6 +55,11 @@ stdenv.mkDerivation rec { } cd ${pkg_path} + # Steps to reduce output size + rm -rf ${pkg_path}/docs ${pkg_path}/sources ${pkg_path}/tests + # We only support cross compiling with gcc for now + rm -rf ${pkg_path}/toolchains/*-clang* ${pkg_path}/toolchains/llvm-* + find ${pkg_path}/toolchains \( \ \( -type f -a -name "*.so*" \) -o \ \( -type f -a -perm -0100 \) \