diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-09-15 12:16:44 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-09-15 12:16:49 -0700 |
| commit | 773b4deb7c5c6300f23f2ec2db4751e40f6520fa (patch) | |
| tree | 45e1caaa95b76b129efe46e8c048be03c91f3baf /pkgs/os-specific | |
| parent | 316a09377d12b29764b5daf51e0df8986a5fe175 (diff) | |
| parent | a6f6c0eeeb45ad122022366724e396955f0f775b (diff) | |
| download | nixpkgs-773b4deb7c5c6300f23f2ec2db4751e40f6520fa.tar nixpkgs-773b4deb7c5c6300f23f2ec2db4751e40f6520fa.tar.gz nixpkgs-773b4deb7c5c6300f23f2ec2db4751e40f6520fa.tar.bz2 nixpkgs-773b4deb7c5c6300f23f2ec2db4751e40f6520fa.tar.lz nixpkgs-773b4deb7c5c6300f23f2ec2db4751e40f6520fa.tar.xz nixpkgs-773b4deb7c5c6300f23f2ec2db4751e40f6520fa.tar.zst nixpkgs-773b4deb7c5c6300f23f2ec2db4751e40f6520fa.zip | |
Merge commit 'a6f6c0e' into master.upstream
This is a partial merge of staging where we have up to date binaries for all packages.
Diffstat (limited to 'pkgs/os-specific')
3 files changed, 22 insertions, 1 deletions
diff --git a/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix b/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix index e2fdef60001..e7f598f55a5 100644 --- a/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix +++ b/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix @@ -6,6 +6,7 @@ rec { ]; IOKit = [ "/System/Library/Frameworks/IOKit.framework" + "/usr/lib/libenergytrace.dylib" ]; DiskArbitration = [ "/System/Library/Frameworks/DiskArbitration.framework" @@ -30,6 +31,8 @@ rec { "/System/Library/PrivateFrameworks/DataDetectorsCore.framework/Versions/A/DataDetectorsCore" "/System/Library/PrivateFrameworks/TCC.framework/Versions/A/TCC" "/System/Library/PrivateFrameworks/LanguageModeling.framework/Versions/A/LanguageModeling" + "/usr/lib/libChineseTokenizer.dylib" + "/usr/lib/libmarisa.dylib" "/usr/lib/libmecabra.dylib" "/usr/lib/libcmph.dylib" "/usr/lib/libiconv.2.dylib" diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix index ecab0941332..108b430d783 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix @@ -34,7 +34,9 @@ appleDerivation rec { "system_platform" "system_pthread" "system_sandbox" - "system_stats" + # does not exist in El Capitan beta + # FIXME: does anything on yosemite actually need this? + # "system_stats" "unc" "unwind" "xpc" diff --git a/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix b/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix new file mode 100644 index 00000000000..0460c516d29 --- /dev/null +++ b/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchgit }: + +stdenv.mkDerivation { + name = "reattach-to-user-namespace-2.4"; + src = fetchgit { + url = "https://github.com/ChrisJohnsen/tmux-MacOSX-pasteboard.git"; + sha256 = "1f9q1wxq764zidnx5hbdkbbyxxzfih0l0cjpgr0pxzwbmd2q6cvv"; + rev = "2765aeab8f337c29e260a912bf4267a2732d8640"; + }; + buildFlags = "ARCHES=x86_64"; + installPhase = '' + mkdir -p $out/bin + cp reattach-to-user-namespace $out/bin/ + ''; +} + |