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: cfe6bd47ed64
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4e376cce7ecc
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on May 31, 2017

  1. lib and doc: Use "libSystem" as identifier for that libc in platforms

    @Ericson2314
    Ericson2314 committed May 31, 2017
    Copy the full SHA
    9f680d3 View commit details

  2. Merge pull request #26269 from obsidiansystems/libSystem 

    lib and doc: Use "libSystem" as identifier for that libc in platforms
    @Ericson2314
    Ericson2314 authored May 31, 2017
    Copy the full SHA
    4e376cc View commit details
Showing with 3 additions and 3 deletions.
  1. +1 −1 doc/cross-compilation.xml
  2. +2 −2 lib/systems/examples.nix
2 changes: 1 addition & 1 deletion doc/cross-compilation.xml
View file
Original file line number Diff line number Diff line change
@@ -128,7 +128,7 @@
<listitem>
<para>
This is a string identifying the standard C library used.
Valid identifiers include "glibc" for GNU libc, "libsystem" for Darwin's Libsystem, and "uclibc" for µClibc.
Valid identifiers include "glibc" for GNU libc, "libSystem" for Darwin's Libsystem, and "uclibc" for µClibc.
It should probably be refactored to use the module system, like <varname>parse</varname>.
</para>
</listitem>
4 changes: 2 additions & 2 deletions lib/systems/examples.nix
View file
Original file line number Diff line number Diff line change
@@ -96,14 +96,14 @@ rec {
iphone64 = {
config = "aarch64-apple-darwin14";
arch = "arm64";
libc = "libsystem";
libc = "libSystem";
platform = {};
};

iphone32 = {
config = "arm-apple-darwin10";
arch = "armv7-a";
libc = "libsystem";
libc = "libSystem";
platform = {};
};