public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

propagate cf-private with AppKit; fixes emacs and others

Browse Source
This commit is contained in:
Jude Taylor 2015-10-11 12:09:06 -07:00
parent 4f1db1f0f8
commit b345f70939
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/editors/emacs-24/default.nix
View File

@ -47,10 +47,8 @@ stdenv.mkDerivation rec {
imagemagick gconf ] imagemagick gconf ]
++ stdenv.lib.optional (withX && withGTK2) gtk2 ++ stdenv.lib.optional (withX && withGTK2) gtk2
++ stdenv.lib.optional (withX && withGTK3) gtk3 ++ stdenv.lib.optional (withX && withGTK3) gtk3
++ stdenv.lib.optional (stdenv.isDarwin && withX) cairo; ++ stdenv.lib.optional (stdenv.isDarwin && withX) cairo
++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Foundation libobjc ];
propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ AppKit Foundation libobjc
];
NIX_LDFLAGS = stdenv.lib.optional stdenv.isDarwin NIX_LDFLAGS = stdenv.lib.optional stdenv.isDarwin
"/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation"; "/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation";

6
pkgs/os-specific/darwin/apple-sdk/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, xar, gzip, cpio, CF }: { stdenv, fetchurl, xar, gzip, cpio, CF, pkgs }:
let let
# sadly needs to be exported because security_tool needs it # sadly needs to be exported because security_tool needs it
@ -148,6 +148,10 @@ in rec {
}; };
overrides = super: { overrides = super: {
AppKit = stdenv.lib.overrideDerivation super.AppKit (drv: {
propagatedNativeBuildInputs = drv.propagatedNativeBuildInputs ++ [ pkgs.darwin.cf-private ];
});
QuartzCore = stdenv.lib.overrideDerivation super.QuartzCore (drv: { QuartzCore = stdenv.lib.overrideDerivation super.QuartzCore (drv: {
installPhase = drv.installPhase + '' installPhase = drv.installPhase + ''
f="$out/Library/Frameworks/QuartzCore.framework/Headers/CoreImage.h" f="$out/Library/Frameworks/QuartzCore.framework/Headers/CoreImage.h"