emacs-24-mac: propagate frameworks

This commit is contained in:
Jude Taylor 2015-10-29 13:55:30 -07:00
parent 7cb6dbc3d0
commit 949c4017b5
2 changed files with 7 additions and 7 deletions

View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, ncurses, pkgconfig, texinfo, libxml2, gnutls, Carbon, Foundation, { stdenv, fetchurl, ncurses, pkgconfig, texinfo, libxml2, gnutls
libobjc, Cocoa, WebKit, Quartz, ImageCaptureCore, OSAKit, cf-private , Carbon, Cocoa, ImageCaptureCore, OSAKit, Quartz, WebKit
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -18,13 +18,14 @@ stdenv.mkDerivation rec {
sha256 = "0p4jh6s1qi6jm6zr82grk65x33ix1hb0fbpih4vh3vnx6310iwsb"; sha256 = "0p4jh6s1qi6jm6zr82grk65x33ix1hb0fbpih4vh3vnx6310iwsb";
}; };
NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations";
enableParallelBuilding = true; enableParallelBuilding = true;
buildInputs = [ buildInputs = [
ncurses pkgconfig texinfo libxml2 gnutls Carbon Cocoa Foundation libobjc WebKit Quartz ncurses pkgconfig texinfo libxml2 gnutls
ImageCaptureCore OSAKit cf-private ];
propagatedBuildInputs = [
Carbon Cocoa ImageCaptureCore OSAKit Quartz WebKit
]; ];
postUnpack = '' postUnpack = ''

View File

@ -11306,7 +11306,6 @@ let
}); });
emacs24Macport_24_5 = lowPrio (newScope darwin.apple_sdk.frameworks ../applications/editors/emacs-24/macport-24.5.nix { emacs24Macport_24_5 = lowPrio (newScope darwin.apple_sdk.frameworks ../applications/editors/emacs-24/macport-24.5.nix {
stdenv = pkgs.clangStdenv; stdenv = pkgs.clangStdenv;
inherit (darwin) libobjc cf-private;
}); });
emacs24Macport = self.emacs24Macport_24_5; emacs24Macport = self.emacs24Macport_24_5;