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: 889bb6873dfd
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 09c66f40454d
Choose a head ref
  • 8 commits
  • 7 files changed
  • 1 contributor

Commits on Jun 25, 2018

  1. libiconv: add "enableShared" option 

    When false, shared libraries will be disabled.

also adds patch to *really* disable shared libiconv.
    @matthewbauer
    matthewbauer committed Jun 25, 2018
    Copy the full SHA
    73e2f60 View commit details
    Browse the repository at this point in the history

  2. android: add --build-id to ldflags 

    the gcc in android does not have this on by default. Doing this will
fix some of the errors in cross-trunk:

https://hydra.nixos.org/build/76354538/nixlog/11

This is related to how separate debug info is handled in Nixpkgs.
    @matthewbauer
    matthewbauer committed Jun 25, 2018
    Copy the full SHA
    7652b2e View commit details
    Browse the repository at this point in the history

  3. androidndk: add fullNDK option 

    Setting this to true will disable removing some of the unused parts of
the NDK toolchain that is unused in Nixpkgs but may be used by others.

/cc @bkchr
    @matthewbauer
    matthewbauer committed Jun 25, 2018
    Copy the full SHA
    d915590 View commit details
    Browse the repository at this point in the history

  4. ghc: build shared on android 

    We run into issues otherwise
    @matthewbauer
    matthewbauer committed Jun 25, 2018
    Copy the full SHA
    2c2169c View commit details
    Browse the repository at this point in the history

  5. android: define __ANDROID_API__ in cflags 

    This is needed for targeting older apis.
    @matthewbauer
    matthewbauer committed Jun 25, 2018
    Copy the full SHA
    5000cc5 View commit details
    Browse the repository at this point in the history

  6. impure.nix: fix handling of localSystem 

    If we passed a localSystem in, we don’t want the current system to
override it. Now we check for localSystem first to avoid getting
"mixed" localSystem values from commands like this:

  nix-build --arg localSystem '{config="x86_64-unknown-linux-musl";}' -A hello

Which would eventually evaluate localSystem to this:

{
  config = "x86_64-unknown-linux-musl";
  system = "x86_64-darwin";
}

& Nix would not be able to run it correctly.

Fixes #41599

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

  7. ghc843: don’t apply stripping in android 

    This breaks some library symbols apparently. ARM symbols must be
incorrectly stripped. Also some very weird issues with patchelf.
    @matthewbauer
    matthewbauer committed Jun 25, 2018
    Copy the full SHA
    69cad91 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #42412 from obsidiansystems/even-more-android-fixes 

    Even more android fixes
    @matthewbauer
    matthewbauer committed Jun 25, 2018
    Copy the full SHA
    09c66f4 View commit details
    Browse the repository at this point in the history