diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-12-13 16:14:47 -0500 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-12-13 16:14:47 -0500 |
| commit | a0b1ebeee965c03e670af7bb6807e213997ebbb4 (patch) | |
| tree | 449dfbb80891d79eea9ce021a1408fce9d73fc48 /pkgs/os-specific/darwin | |
| parent | 84fb59e0be30504e16ed428c34f1b321f6187fbe (diff) | |
| parent | 105d9519c128a8954e5dd1616f71311ddde20cbc (diff) | |
| download | nixlib-a0b1ebeee965c03e670af7bb6807e213997ebbb4.tar nixlib-a0b1ebeee965c03e670af7bb6807e213997ebbb4.tar.gz nixlib-a0b1ebeee965c03e670af7bb6807e213997ebbb4.tar.bz2 nixlib-a0b1ebeee965c03e670af7bb6807e213997ebbb4.tar.lz nixlib-a0b1ebeee965c03e670af7bb6807e213997ebbb4.tar.xz nixlib-a0b1ebeee965c03e670af7bb6807e213997ebbb4.tar.zst nixlib-a0b1ebeee965c03e670af7bb6807e213997ebbb4.zip | |
Merge remote-tracking branch 'upstream/staging' into binutils-wrapper
Diffstat (limited to 'pkgs/os-specific/darwin')
3 files changed, 20 insertions, 2 deletions
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_kernel_symbols b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_kernel_symbols index ed76787a9008..000af8ad7b74 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_kernel_symbols +++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_kernel_symbols @@ -451,7 +451,6 @@ _host_statistics _host_statistics64 _host_swap_exception_ports _host_virtual_physical_table_info -_host_zone_info _i386_get_ldt _i386_set_ldt _important_boost_assertion_token diff --git a/pkgs/os-specific/darwin/duti/default.nix b/pkgs/os-specific/darwin/duti/default.nix index 10eac5d47191..a9051fd1279f 100644 --- a/pkgs/os-specific/darwin/duti/default.nix +++ b/pkgs/os-specific/darwin/duti/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; maintainers = with maintainers; [matthewbauer]; platforms = platforms.darwin; - licenses = licenses.publicDomain; + license = licenses.publicDomain; homepage = "http://duti.org/"; }; } diff --git a/pkgs/os-specific/darwin/insert_dylib/default.nix b/pkgs/os-specific/darwin/insert_dylib/default.nix new file mode 100644 index 000000000000..b3790b8c87c3 --- /dev/null +++ b/pkgs/os-specific/darwin/insert_dylib/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchFromGitHub, xcbuild }: + +stdenv.mkDerivation + { name = "insert_dylib-2016.08.28"; + src = fetchFromGitHub + { owner = "Tyilo"; + repo = "insert_dylib"; + rev = "c8beef66a08688c2feeee2c9b6eaf1061c2e67a9"; + sha256 = "0az38y06pvvy9jf2wnzdwp9mp98lj6nr0ldv0cs1df5p9x2qvbya"; + }; + buildInputs = [ xcbuild ]; + installPhase = + '' + prog=$(find . -type f -name insert_dylib) + mkdir -p $out/bin + install -m755 $prog $out/bin + ''; + meta.platforms = stdenv.lib.platforms.darwin; + } |