Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: bbef861e0f48
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e1e9b197f974
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jun 22, 2018

  1. android: fix from last output size reduction 

    Directories weren’t being removed properly.
    @matthewbauer
    matthewbauer committed Jun 22, 2018
    Copy the full SHA
    e1e9b19 View commit details
Showing with 5 additions and 5 deletions.
  1. +5 −5 pkgs/development/mobile/androidenv/androidndk.nix
10 changes: 5 additions & 5 deletions pkgs/development/mobile/androidenv/androidndk.nix
View file
Original file line number Diff line number Diff line change
@@ -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 \) \