darwin purity: emacs-24.5-mac

+86 -7
+12 -2
pkgs/applications/editors/emacs-24/macport-24.5.nix
··· 1 - { stdenv, fetchurl, ncurses, pkgconfig, texinfo, libxml2, gnutls 2 }: 3 4 stdenv.mkDerivation rec { ··· 17 sha256 = "0d4r4mgqxcdba715lbr7rk4bxz7yjxi6wv63kyh6gaqbfgql41vf"; 18 }; 19 20 - buildInputs = [ ncurses pkgconfig texinfo libxml2 gnutls ]; 21 22 postUnpack = '' 23 mv $emacsName $name
··· 1 + { stdenv, fetchurl, ncurses, pkgconfig, texinfo, libxml2, gnutls, Carbon, Foundation, 2 + libobjc, Cocoa, WebKit, Quartz, ImageCaptureCore, OSAKit 3 }: 4 5 stdenv.mkDerivation rec { ··· 18 sha256 = "0d4r4mgqxcdba715lbr7rk4bxz7yjxi6wv63kyh6gaqbfgql41vf"; 19 }; 20 21 + NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations"; 22 + NIX_LDFLAGS = stdenv.lib.optional stdenv.isDarwin 23 + "/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation"; 24 + 25 + enableParallelBuilding = true; 26 + 27 + buildInputs = [ 28 + ncurses pkgconfig texinfo libxml2 gnutls Carbon Cocoa Foundation libobjc WebKit Quartz 29 + ImageCaptureCore OSAKit 30 + ]; 31 32 postUnpack = '' 33 mv $emacsName $name
+13 -1
pkgs/os-specific/darwin/apple-sdk/default.nix
··· 144 }; 145 }; 146 147 - frameworks = stdenv.lib.mapAttrs framework (import ./frameworks.nix { inherit frameworks libs CF; }); 148 149 inherit sdk; 150 }
··· 144 }; 145 }; 146 147 + overrides = super: { 148 + QuartzCore = stdenv.lib.overrideDerivation super.QuartzCore (drv: { 149 + installPhase = drv.installPhase + '' 150 + f="$out/Library/Frameworks/QuartzCore.framework/Headers/CoreImage.h" 151 + substituteInPlace "$f" \ 152 + --replace "QuartzCore/../Frameworks/CoreImage.framework/Headers" "CoreImage" 153 + ''; 154 + }); 155 + }; 156 + 157 + bareFrameworks = stdenv.lib.mapAttrs framework (import ./frameworks.nix { inherit frameworks libs CF; }); 158 + 159 + frameworks = bareFrameworks // overrides bareFrameworks; 160 161 inherit sdk; 162 }
+3 -3
pkgs/os-specific/darwin/apple-sdk/frameworks.nix
··· 80 PreferencePanes = []; 81 PubSub = []; 82 Python = [ ApplicationServices ]; 83 - QTKit = [ QuickTime ]; 84 QuickLook = [ ApplicationServices CF ]; 85 QuickTime = [ ApplicationServices AudioUnit Carbon CoreAudio CoreServices OpenGL QuartzCore ]; 86 Ruby = []; ··· 103 Tk = [ ApplicationServices Carbon X11 ]; 104 VideoDecodeAcceleration = [ CF CoreVideo ]; 105 VideoToolbox = [ CF CoreMedia CoreVideo ]; 106 - WebKit = [ ApplicationServices Carbon JavaScriptCore OpenGL X11 ]; 107 108 # Umbrellas 109 Accelerate = [ CoreWLAN IOBluetooth ]; ··· 114 IOBluetooth = [ IOKit ]; 115 JavaVM = []; 116 OpenDirectory = []; 117 - Quartz = [ QuickLook ]; 118 QuartzCore = [ ApplicationServices CF CoreVideo OpenCL ]; 119 }
··· 80 PreferencePanes = []; 81 PubSub = []; 82 Python = [ ApplicationServices ]; 83 + QTKit = [ CoreMediaIO CoreMedia MediaToolbox QuickTime VideoToolbox ]; 84 QuickLook = [ ApplicationServices CF ]; 85 QuickTime = [ ApplicationServices AudioUnit Carbon CoreAudio CoreServices OpenGL QuartzCore ]; 86 Ruby = []; ··· 103 Tk = [ ApplicationServices Carbon X11 ]; 104 VideoDecodeAcceleration = [ CF CoreVideo ]; 105 VideoToolbox = [ CF CoreMedia CoreVideo ]; 106 + WebKit = [ ApplicationServices Carbon JavaScriptCore OpenGL ]; 107 108 # Umbrellas 109 Accelerate = [ CoreWLAN IOBluetooth ]; ··· 114 IOBluetooth = [ IOKit ]; 115 JavaVM = []; 116 OpenDirectory = []; 117 + Quartz = [ QuickLook QTKit ]; 118 QuartzCore = [ ApplicationServices CF CoreVideo OpenCL ]; 119 }
+50
pkgs/os-specific/darwin/apple-sdk/impure-deps.nix
··· 7 IOKit = [ 8 "/System/Library/Frameworks/IOKit.framework" 9 ]; 10 DiskArbitration = [ 11 "/System/Library/Frameworks/DiskArbitration.framework" 12 ];
··· 7 IOKit = [ 8 "/System/Library/Frameworks/IOKit.framework" 9 ]; 10 + JavaScriptCore = [ 11 + "/System/Library/Frameworks/JavaScriptCore.framework" 12 + ]; 13 + QuickLook = [ 14 + "/System/Library/Frameworks/QuickLook.framework" 15 + ]; 16 + Quartz = [ 17 + "/System/Library/Frameworks/Quartz.framework" 18 + "/System/Library/PrivateFrameworks/AppleSystemInfo.framework/Versions/A/AppleSystemInfo" 19 + "/System/Library/PrivateFrameworks/CorePDF.framework/Versions/A/CorePDF" 20 + "/usr/lib/libspindump.dylib" 21 + ]; 22 + ImageCaptureCore = [ 23 + "/System/Library/Frameworks/ImageCaptureCore.framework" 24 + ]; 25 + VideoToolbox = [ 26 + "/System/Library/Frameworks/VideoToolbox.framework" 27 + "/System/Library/PrivateFrameworks/AppleVA.framework/Versions/A/AppleVA" 28 + ]; 29 + QuickTime = [ 30 + "/System/Library/Frameworks/QuickTime.framework" 31 + ]; 32 + CoreMedia = [ 33 + "/System/Library/Frameworks/CoreMedia.framework" 34 + ]; 35 + CoreMediaIO = [ 36 + "/System/Library/Frameworks/CoreMediaIO.framework" 37 + "/System/Library/PrivateFrameworks/AppSandbox.framework/Versions/A/AppSandbox" 38 + "/System/Library/PrivateFrameworks/AppContainer.framework/Versions/A/AppContainer" 39 + "/System/Library/PrivateFrameworks/SecCodeWrapper.framework/Versions/A/SecCodeWrapper" 40 + "/System/Library/PrivateFrameworks/XPCService.framework/Versions/A/XPCService" 41 + "/usr/lib/libsandbox.1.dylib" 42 + "/usr/lib/libMatch.1.dylib" 43 + ]; 44 + MediaToolbox = [ 45 + "/System/Library/Frameworks/MediaToolbox.framework" 46 + "/System/Library/PrivateFrameworks/CoreAUC.framework/Versions/A/CoreAUC" 47 + "/System/Library/PrivateFrameworks/NetworkStatistics.framework/Versions/A/NetworkStatistics" 48 + ]; 49 + QTKit = [ 50 + "/System/Library/Frameworks/QTKit.framework" 51 + "/System/Library/PrivateFrameworks/CoreMediaAuthoring.framework/Versions/A/CoreMediaAuthoring" 52 + ]; 53 + OSAKit = [ 54 + "/System/Library/Frameworks/OSAKit.framework" 55 + "/usr/lib/libexslt.0.dylib" 56 + ]; 57 + WebKit = [ 58 + "/System/Library/Frameworks/WebKit.framework" 59 + ]; 60 DiskArbitration = [ 61 "/System/Library/Frameworks/DiskArbitration.framework" 62 ];
+6
pkgs/os-specific/darwin/apple-source-releases/CF/default.nix
··· 51 cp /System/Library/Frameworks/CoreFoundation.framework/Headers/{CFAttributedString,CFNotificationCenter}.h \ 52 "$out/System/Library/Frameworks/CoreFoundation.framework/Headers" 53 54 mv $out/System/* $out 55 rmdir $out/System 56 '';
··· 51 cp /System/Library/Frameworks/CoreFoundation.framework/Headers/{CFAttributedString,CFNotificationCenter}.h \ 52 "$out/System/Library/Frameworks/CoreFoundation.framework/Headers" 53 54 + cat >> $out/System/Library/Frameworks/CoreFoundation.framework/Headers/CoreFoundation.h <<EOF 55 + /* extra private system files [IMPURE] */ 56 + #include <CoreFoundation/CFAttributedString.h> 57 + #include <CoreFoundation/CFNotificationCenter.h> 58 + EOF 59 + 60 mv $out/System/* $out 61 rmdir $out/System 62 '';
+2 -1
pkgs/top-level/all-packages.nix
··· 11113 emacs24Macport_24_4 = lowPrio (callPackage ../applications/editors/emacs-24/macport-24.4.nix { 11114 stdenv = pkgs.clangStdenv; 11115 }); 11116 - emacs24Macport_24_5 = lowPrio (callPackage ../applications/editors/emacs-24/macport-24.5.nix { 11117 stdenv = pkgs.clangStdenv; 11118 }); 11119 emacs24Macport = self.emacs24Macport_24_5; 11120
··· 11113 emacs24Macport_24_4 = lowPrio (callPackage ../applications/editors/emacs-24/macport-24.4.nix { 11114 stdenv = pkgs.clangStdenv; 11115 }); 11116 + emacs24Macport_24_5 = lowPrio (newScope darwin.apple_sdk.frameworks ../applications/editors/emacs-24/macport-24.5.nix { 11117 stdenv = pkgs.clangStdenv; 11118 + inherit (darwin) libobjc; 11119 }); 11120 emacs24Macport = self.emacs24Macport_24_5; 11121