diff options
| author | Jude Taylor <me@jude.bio> | 2015-10-29 13:55:30 -0700 |
|---|---|---|
| committer | Jude Taylor <me@jude.bio> | 2015-10-29 13:56:02 -0700 |
| commit | 949c4017b566271a92cef107b828f8b81ce3e283 (patch) | |
| tree | e393b40b850ec0ae467bfb6b559fdc1eea2e947d | |
| parent | 7cb6dbc3d002be0cfd82631def276e357f4ee1dd (diff) | |
| download | nixlib-949c4017b566271a92cef107b828f8b81ce3e283.tar nixlib-949c4017b566271a92cef107b828f8b81ce3e283.tar.gz nixlib-949c4017b566271a92cef107b828f8b81ce3e283.tar.bz2 nixlib-949c4017b566271a92cef107b828f8b81ce3e283.tar.lz nixlib-949c4017b566271a92cef107b828f8b81ce3e283.tar.xz nixlib-949c4017b566271a92cef107b828f8b81ce3e283.tar.zst nixlib-949c4017b566271a92cef107b828f8b81ce3e283.zip | |
emacs-24-mac: propagate frameworks
| -rw-r--r-- | pkgs/applications/editors/emacs-24/macport-24.5.nix | 13 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/applications/editors/emacs-24/macport-24.5.nix b/pkgs/applications/editors/emacs-24/macport-24.5.nix index eaed603ffee2..0801819a3181 100644 --- a/pkgs/applications/editors/emacs-24/macport-24.5.nix +++ b/pkgs/applications/editors/emacs-24/macport-24.5.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, ncurses, pkgconfig, texinfo, libxml2, gnutls, Carbon, Foundation, -libobjc, Cocoa, WebKit, Quartz, ImageCaptureCore, OSAKit, cf-private +{ stdenv, fetchurl, ncurses, pkgconfig, texinfo, libxml2, gnutls +, Carbon, Cocoa, ImageCaptureCore, OSAKit, Quartz, WebKit }: stdenv.mkDerivation rec { @@ -18,13 +18,14 @@ stdenv.mkDerivation rec { sha256 = "0p4jh6s1qi6jm6zr82grk65x33ix1hb0fbpih4vh3vnx6310iwsb"; }; - NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations"; - enableParallelBuilding = true; buildInputs = [ - ncurses pkgconfig texinfo libxml2 gnutls Carbon Cocoa Foundation libobjc WebKit Quartz - ImageCaptureCore OSAKit cf-private + ncurses pkgconfig texinfo libxml2 gnutls + ]; + + propagatedBuildInputs = [ + Carbon Cocoa ImageCaptureCore OSAKit Quartz WebKit ]; postUnpack = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7cc7aa98ed21..df72eafdfcb7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11306,7 +11306,6 @@ let }); emacs24Macport_24_5 = lowPrio (newScope darwin.apple_sdk.frameworks ../applications/editors/emacs-24/macport-24.5.nix { stdenv = pkgs.clangStdenv; - inherit (darwin) libobjc cf-private; }); emacs24Macport = self.emacs24Macport_24_5; |