diff options
author | William A. Kennington III <william@wkennington.com> | 2015-10-01 10:43:44 -0700 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-10-01 10:43:44 -0700 |
commit | 98172435f7ccf1912ab7804296c5026a545ae2dd (patch) | |
tree | 8df4430c1dbb2a5a09ca5085cd9198da896c4a87 /pkgs/os-specific | |
parent | e7bb9e102323f79832c2e0553b98651a582368c9 (diff) | |
parent | 14961c87810330d22fc1ee11e11a17e32805ff8b (diff) | |
download | nixlib-98172435f7ccf1912ab7804296c5026a545ae2dd.tar nixlib-98172435f7ccf1912ab7804296c5026a545ae2dd.tar.gz nixlib-98172435f7ccf1912ab7804296c5026a545ae2dd.tar.bz2 nixlib-98172435f7ccf1912ab7804296c5026a545ae2dd.tar.lz nixlib-98172435f7ccf1912ab7804296c5026a545ae2dd.tar.xz nixlib-98172435f7ccf1912ab7804296c5026a545ae2dd.tar.zst nixlib-98172435f7ccf1912ab7804296c5026a545ae2dd.zip |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/os-specific')
5 files changed, 72 insertions, 6 deletions
diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix index fd578cf33d62..7bdff59c5ae8 100644 --- a/pkgs/os-specific/darwin/apple-sdk/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk/default.nix @@ -144,7 +144,19 @@ in rec { }; }; - frameworks = stdenv.lib.mapAttrs framework (import ./frameworks.nix { inherit frameworks libs CF; }); + overrides = super: { + QuartzCore = stdenv.lib.overrideDerivation super.QuartzCore (drv: { + installPhase = drv.installPhase + '' + f="$out/Library/Frameworks/QuartzCore.framework/Headers/CoreImage.h" + substituteInPlace "$f" \ + --replace "QuartzCore/../Frameworks/CoreImage.framework/Headers" "CoreImage" + ''; + }); + }; + + bareFrameworks = stdenv.lib.mapAttrs framework (import ./frameworks.nix { inherit frameworks libs CF; }); + + frameworks = bareFrameworks // overrides bareFrameworks; inherit sdk; } diff --git a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix index f6bf51f94432..3889ba211a46 100644 --- a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix +++ b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix @@ -80,7 +80,7 @@ with frameworks; with libs; { PreferencePanes = []; PubSub = []; Python = [ ApplicationServices ]; - QTKit = [ QuickTime ]; + QTKit = [ CoreMediaIO CoreMedia MediaToolbox QuickTime VideoToolbox ]; QuickLook = [ ApplicationServices CF ]; QuickTime = [ ApplicationServices AudioUnit Carbon CoreAudio CoreServices OpenGL QuartzCore ]; Ruby = []; @@ -103,7 +103,7 @@ with frameworks; with libs; { Tk = [ ApplicationServices Carbon X11 ]; VideoDecodeAcceleration = [ CF CoreVideo ]; VideoToolbox = [ CF CoreMedia CoreVideo ]; - WebKit = [ ApplicationServices Carbon JavaScriptCore OpenGL X11 ]; + WebKit = [ ApplicationServices Carbon JavaScriptCore OpenGL ]; # Umbrellas Accelerate = [ CoreWLAN IOBluetooth ]; @@ -114,6 +114,6 @@ with frameworks; with libs; { IOBluetooth = [ IOKit ]; JavaVM = []; OpenDirectory = []; - Quartz = [ QuickLook ]; + Quartz = [ QuickLook QTKit ]; QuartzCore = [ ApplicationServices CF CoreVideo OpenCL ]; } diff --git a/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix b/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix index e2fdef60001f..13bc3fbb6909 100644 --- a/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix +++ b/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix @@ -7,6 +7,56 @@ rec { IOKit = [ "/System/Library/Frameworks/IOKit.framework" ]; + JavaScriptCore = [ + "/System/Library/Frameworks/JavaScriptCore.framework" + ]; + QuickLook = [ + "/System/Library/Frameworks/QuickLook.framework" + ]; + Quartz = [ + "/System/Library/Frameworks/Quartz.framework" + "/System/Library/PrivateFrameworks/AppleSystemInfo.framework/Versions/A/AppleSystemInfo" + "/System/Library/PrivateFrameworks/CorePDF.framework/Versions/A/CorePDF" + "/usr/lib/libspindump.dylib" + ]; + ImageCaptureCore = [ + "/System/Library/Frameworks/ImageCaptureCore.framework" + ]; + VideoToolbox = [ + "/System/Library/Frameworks/VideoToolbox.framework" + "/System/Library/PrivateFrameworks/AppleVA.framework/Versions/A/AppleVA" + ]; + QuickTime = [ + "/System/Library/Frameworks/QuickTime.framework" + ]; + CoreMedia = [ + "/System/Library/Frameworks/CoreMedia.framework" + ]; + CoreMediaIO = [ + "/System/Library/Frameworks/CoreMediaIO.framework" + "/System/Library/PrivateFrameworks/AppSandbox.framework/Versions/A/AppSandbox" + "/System/Library/PrivateFrameworks/AppContainer.framework/Versions/A/AppContainer" + "/System/Library/PrivateFrameworks/SecCodeWrapper.framework/Versions/A/SecCodeWrapper" + "/System/Library/PrivateFrameworks/XPCService.framework/Versions/A/XPCService" + "/usr/lib/libsandbox.1.dylib" + "/usr/lib/libMatch.1.dylib" + ]; + MediaToolbox = [ + "/System/Library/Frameworks/MediaToolbox.framework" + "/System/Library/PrivateFrameworks/CoreAUC.framework/Versions/A/CoreAUC" + "/System/Library/PrivateFrameworks/NetworkStatistics.framework/Versions/A/NetworkStatistics" + ]; + QTKit = [ + "/System/Library/Frameworks/QTKit.framework" + "/System/Library/PrivateFrameworks/CoreMediaAuthoring.framework/Versions/A/CoreMediaAuthoring" + ]; + OSAKit = [ + "/System/Library/Frameworks/OSAKit.framework" + "/usr/lib/libexslt.0.dylib" + ]; + WebKit = [ + "/System/Library/Frameworks/WebKit.framework" + ]; DiskArbitration = [ "/System/Library/Frameworks/DiskArbitration.framework" ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/CF/default.nix b/pkgs/os-specific/darwin/apple-source-releases/CF/default.nix index c7fcbb0aabbe..ba97aa4a1fc7 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/CF/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/CF/default.nix @@ -51,6 +51,12 @@ appleDerivation { cp /System/Library/Frameworks/CoreFoundation.framework/Headers/{CFAttributedString,CFNotificationCenter}.h \ "$out/System/Library/Frameworks/CoreFoundation.framework/Headers" + cat >> $out/System/Library/Frameworks/CoreFoundation.framework/Headers/CoreFoundation.h <<EOF + /* extra private system files [IMPURE] */ + #include <CoreFoundation/CFAttributedString.h> + #include <CoreFoundation/CFNotificationCenter.h> + EOF + mv $out/System/* $out rmdir $out/System ''; diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index ef35757fdb24..218532a695e0 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -478,8 +478,6 @@ with stdenv.lib; ''} ZRAM m - ${optionalString (versionAtLeast version "3.17") "NFC? n"} - # Enable firmware loading via udev (legacy). ${optionalString (versionAtLeast version "3.17") '' FW_LOADER_USER_HELPER_FALLBACK y |