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
base: 876598a2ddf8
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 6c17928d5253
Choose a head ref
  • 3 commits
  • 5 files changed
  • 1 contributor

Commits on Jun 22, 2018

  1. android: Use NDK 17 for aarch32

    @matthewbauer
    matthewbauer committed Jun 22, 2018
    Copy the full SHA
    cf09ffe View commit details
    Browse the repository at this point in the history

  2. android: add ndkVer to resolve ndk ambiguity 

    It wasn’t exactly clear which NDK you were using previously. This adds
an attribute to system that handles what version of the NDK we should
use when building things.

/cc @Ericson2314
    @matthewbauer
    matthewbauer committed Jun 22, 2018
    Copy the full SHA
    c8fd285 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #42378 from obsidiansystems/fix-android32 

    androidndk: Fix version selection
    @matthewbauer
    matthewbauer committed Jun 22, 2018
    Copy the full SHA
    6c17928 View commit details
    Browse the repository at this point in the history