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: 8d2040c2650d
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 2c3d4229643c
Choose a head ref
  • 5 commits
  • 7 files changed
  • 1 contributor

Commits on Sep 9, 2020

  1. cc-wrapper: Fix for prebuilt android

    We don't want to use Nix-built GCC's libs with prebuilt clang in this
    case.
    Ericson2314 authored and jonringer committed Sep 9, 2020
    Copy the full SHA
    b5476ce View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    1ae53f4 View commit details
    Browse the repository at this point in the history
  3. androidndkPkgs: Take version from underlying package

    We can now do this, so let's.
    Ericson2314 authored and jonringer committed Sep 9, 2020
    Copy the full SHA
    9f68e34 View commit details
    Browse the repository at this point in the history
  4. lib.systems.examples: Bump android SDK to 21

    074bc78 evidently meant to do this, but
    forgot.
    Ericson2314 authored and jonringer committed Sep 9, 2020
    Copy the full SHA
    55dd610 View commit details
    Browse the repository at this point in the history
  5. androidndk: Avoid depending on target-sensative openjdk

    We just need jdk for this script that helps set up toolchains. The
    script might need to know about the target platform, but the interpreter
    that runs it (or part of it) doesn't.
    Ericson2314 authored and jonringer committed Sep 9, 2020
    Copy the full SHA
    2c3d422 View commit details
    Browse the repository at this point in the history