diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-31 00:16:31 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-31 00:16:31 +0100 |
commit | 5cc0468a206c93ff246605a18eff562619d5a3b7 (patch) | |
tree | b845e8566f5f895d9b4fe451bb40e5a816670de7 /pkgs/os-specific | |
parent | 035bbb336aecc791ba3917f39653e7b6fa00036b (diff) | |
parent | 1a3a0e818144629b6b3dd8fbe174dc867aabdbf1 (diff) |
Merge staging into staging-next
Diffstat (limited to 'pkgs/os-specific')
4 files changed, 28 insertions, 15 deletions
diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix index aef7341e5e9f8..9890d385259ce 100644 --- a/pkgs/os-specific/darwin/apple-sdk/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk/default.nix @@ -61,9 +61,16 @@ let installPhase = '' linkFramework() { local path="$1" + local nested_path="$1" local dest="$out/Library/Frameworks/$path" + if [ "$path" == "JavaNativeFoundation.framework" ]; then + local nested_path="JavaVM.framework/Versions/A/Frameworks/JavaNativeFoundation.framework" + fi + if [ "$path" == "JavaRuntimeSupport.framework" ]; then + local nested_path="JavaVM.framework/Versions/A/Frameworks/JavaRuntimeSupport.framework" + fi local name="$(basename "$path" .framework)" - local current="$(readlink "/System/Library/Frameworks/$path/Versions/Current")" + local current="$(readlink "/System/Library/Frameworks/$nested_path/Versions/Current")" if [ -z "$current" ]; then current=A fi @@ -75,25 +82,21 @@ let # ApplicationServices in the 10.9 SDK local isChild=0 - if [ -d "${sdk.out}/Library/Frameworks/$path/Versions/$current/Headers" ]; then + if [ -d "${sdk.out}/Library/Frameworks/$nested_path/Versions/$current/Headers" ]; then isChild=1 - cp -R "${sdk.out}/Library/Frameworks/$path/Versions/$current/Headers" . + cp -R "${sdk.out}/Library/Frameworks/$nested_path/Versions/$current/Headers" . elif [ -d "${sdk.out}/Library/Frameworks/$name.framework/Versions/$current/Headers" ]; then current="$(readlink "/System/Library/Frameworks/$name.framework/Versions/Current")" cp -R "${sdk.out}/Library/Frameworks/$name.framework/Versions/$current/Headers" . fi - ln -s -L "/System/Library/Frameworks/$path/Versions/$current/$name" - ln -s -L "/System/Library/Frameworks/$path/Versions/$current/Resources" + ln -s -L "/System/Library/Frameworks/$nested_path/Versions/$current/$name" + ln -s -L "/System/Library/Frameworks/$nested_path/Versions/$current/Resources" - if [ -f "/System/Library/Frameworks/$path/module.map" ]; then - ln -s "/System/Library/Frameworks/$path/module.map" + if [ -f "/System/Library/Frameworks/$nested_path/module.map" ]; then + ln -s "/System/Library/Frameworks/$nested_path/module.map" fi - if [ $isChild -eq 1 ]; then - pushd "${sdk.out}/Library/Frameworks/$path/Versions/$current" >/dev/null - else - pushd "${sdk.out}/Library/Frameworks/$name.framework/Versions/$current" >/dev/null - fi + pushd "${sdk.out}/Library/Frameworks/$nested_path/Versions/$current" >/dev/null local children=$(echo Frameworks/*.framework) popd >/dev/null @@ -109,7 +112,6 @@ let popd >/dev/null } - linkFramework "${name}.framework" ''; diff --git a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix index b5a378cc6ae18..09e0e4e48ecdf 100644 --- a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix +++ b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix @@ -65,6 +65,8 @@ with frameworks; with libs; { InstallerPlugins = []; InstantMessage = []; JavaFrameEmbedding = []; + JavaNativeFoundation = []; + JavaRuntimeSupport = []; JavaScriptCore = []; Kerberos = []; Kernel = [ IOKit ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix index 46e9e592ddc69..e7aa47bdb6b1f 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix @@ -12,5 +12,14 @@ appleDerivation { cp -r dispatch/*.h $out/include/dispatch cp -r os/object*.h $out/include/os + + # gcc compatability. Source: https://stackoverflow.com/a/28014302/3714556 + substituteInPlace $out/include/dispatch/object.h \ + --replace 'typedef void (^dispatch_block_t)(void);' \ + '#ifdef __clang__ + typedef void (^dispatch_block_t)(void); + #else + typedef void* dispatch_block_t; + #endif' ''; } diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index b8b46b33e96c6..8e753121b7f02 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "iproute2"; - version = "5.4.0"; + version = "5.5.0"; src = fetchurl { url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1bl6c3af7wbgi6nqjfm32fkhqh63iphkg2g11f1srifll1ham5zy"; + sha256 = "0ywg70f98wgfai35jl47xzpjp45a6n7crja4vc8ql85cbi1l7ids"; }; preConfigure = '' |