From 83deac082fdfa55ca12f95f7447d0218c47da748 Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Wed, 28 Oct 2015 13:34:48 -0700 Subject: [PATCH] clean up emacs arguments --- pkgs/applications/editors/emacs-24/default.nix | 2 +- pkgs/top-level/all-packages.nix | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix index e847bb42d79..9d4a6703e72 100644 --- a/pkgs/applications/editors/emacs-24/default.nix +++ b/pkgs/applications/editors/emacs-24/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d , pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif , libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls -, alsaLib, cairo, acl, gpm, AppKit, Foundation, libobjc +, alsaLib, cairo, acl, gpm, AppKit , withX ? !stdenv.isDarwin , withGTK3 ? false, gtk3 ? null , withGTK2 ? true, gtk2 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index af04786f117..d9477ea06f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11261,8 +11261,7 @@ let imagemagick = null; acl = null; gpm = null; - inherit (darwin.apple_sdk.frameworks) AppKit Foundation; - inherit (darwin) libobjc; + inherit (darwin.apple_sdk.frameworks) AppKit; }; emacs24-nox = lowPrio (appendToName "nox" (emacs24.override {