Navigation Menu

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

Commits on Sep 7, 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
    Ericson2314 committed Sep 7, 2020
    Copy the full SHA
    204dc3a View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2020

  1. deployAndroidPackage: Use pname and version

    @Ericson2314
    Ericson2314 committed Sep 8, 2020
    Copy the full SHA
    4c489b5 View commit details
    Browse the repository at this point in the history

  2. androidndkPkgs: Take version from underlying package 

    We can now do this, so let's.
    @Ericson2314
    Ericson2314 committed Sep 8, 2020
    Copy the full SHA
    7cac79b View commit details
    Browse the repository at this point in the history

  3. lib.systems.examples: Bump android SDK to 21 

    074bc78 evidently meant to do this, but
forgot.
    @Ericson2314
    Ericson2314 committed Sep 8, 2020
    Copy the full SHA
    e2bef8f View commit details
    Browse the repository at this point in the history

  4. 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
    Ericson2314 committed Sep 8, 2020
    Copy the full SHA
    452854a View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2020

  1. Merge pull request #97387 from Ericson2314/fix-android-prebuilt 

    cc-wrapper: Fix for prebuilt android
    @Ericson2314
    Ericson2314 committed Sep 9, 2020
    Copy the full SHA
    5fd2750 View commit details
    Browse the repository at this point in the history