summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2016-04-05 10:04:32 +0200
committerPeter Simons <simons@cryp.to>2016-04-05 10:04:32 +0200
commitd2ef7ab10fcb77719823e6f0a703a07cd1aa194f (patch)
tree3ab3d32a38f6ac2a252076cdb73923231065401c /pkgs/top-level
parent9fc2dfabfd489d5cbe521bafc9485ba44cfb8a01 (diff)
parent9b52caaa0c57a24a403c436d9e0b7f154af1a097 (diff)
downloadnixpkgs-d2ef7ab10fcb77719823e6f0a703a07cd1aa194f.tar
nixpkgs-d2ef7ab10fcb77719823e6f0a703a07cd1aa194f.tar.gz
nixpkgs-d2ef7ab10fcb77719823e6f0a703a07cd1aa194f.tar.bz2
nixpkgs-d2ef7ab10fcb77719823e6f0a703a07cd1aa194f.tar.lz
nixpkgs-d2ef7ab10fcb77719823e6f0a703a07cd1aa194f.tar.xz
nixpkgs-d2ef7ab10fcb77719823e6f0a703a07cd1aa194f.tar.zst
nixpkgs-d2ef7ab10fcb77719823e6f0a703a07cd1aa194f.zip
Merge pull request #14467 from DamienCassou/emacs-25.0.92
emacs25pre: 25.0.50-1b5630e -> 25.0.92
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix3
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 304a698df67..7b336c9f1a8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11990,8 +11990,7 @@ in
     imagemagick = null;
     acl = null;
     gpm = null;
-    inherit (darwin.apple_sdk.frameworks) AppKit Foundation;
-    inherit (darwin) libobjc;
+    inherit (darwin.apple_sdk.frameworks) AppKit CoreWLAN GSS Kerberos ImageIO;
   });
 
   emacsPackagesGen = emacs: self: let callPackage = newScope self; in rec {