about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorPeriklis Tsirakidis <periklis.tsirakidis@mayflower.de>2016-09-21 22:19:57 +0200
committerRobin Gloster <mail@glob.in>2016-09-21 22:19:57 +0200
commit937b56f5db384b8e9edee3f4d9db98980db65384 (patch)
treeba5c4320717502441f7d3a0bd71e506923ab50ce /pkgs/top-level
parent61195dbc41e07c6231fa53bc1f853783e0356ca4 (diff)
downloadnixlib-937b56f5db384b8e9edee3f4d9db98980db65384.tar
nixlib-937b56f5db384b8e9edee3f4d9db98980db65384.tar.gz
nixlib-937b56f5db384b8e9edee3f4d9db98980db65384.tar.bz2
nixlib-937b56f5db384b8e9edee3f4d9db98980db65384.tar.lz
nixlib-937b56f5db384b8e9edee3f4d9db98980db65384.tar.xz
nixlib-937b56f5db384b8e9edee3f4d9db98980db65384.tar.zst
nixlib-937b56f5db384b8e9edee3f4d9db98980db65384.zip
emacs-25-macport: init at 25.1-mac-6.0 (#18363)
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix13
1 files changed, 10 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d8d4e1be75d9..8c45c5a2e94c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7294,8 +7294,8 @@ in
     x265 = if stdenv.isDarwin then null else x265;
     xavs = if stdenv.isDarwin then null else xavs;
     inherit (darwin) CF;
-    inherit (darwin.apple_sdk.frameworks) 
-      Cocoa CoreServices CoreAudio AVFoundation MediaToolbox 
+    inherit (darwin.apple_sdk.frameworks)
+      Cocoa CoreServices CoreAudio AVFoundation MediaToolbox
       VideoDecodeAcceleration;
   };
 
@@ -7955,7 +7955,7 @@ in
   libcaca = callPackage ../development/libraries/libcaca { };
 
   libcanberra_gtk3 = callPackage ../development/libraries/libcanberra {
-    gtk = pkgs.gtk3; 
+    gtk = pkgs.gtk3;
   };
   libcanberra_gtk2 = pkgs.libcanberra_gtk3.override { gtk = pkgs.gtk2; };
 
@@ -12896,6 +12896,13 @@ in
   });
   emacs24Macport = self.emacs24Macport_24_5;
 
+  emacs25Macport_25_1 = lowPrio (callPackage ../applications/editors/emacs/macport-25.1.nix {
+    inherit (darwin.apple_sdk.frameworks)
+      AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit
+      ImageCaptureCore GSS ImageIO;
+  });
+  emacs25Macport = self.emacs25Macport_25_1;
+
   emacsPackagesGen = emacs: self: let callPackage = newScope self; in rec {
     inherit emacs;