JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

emacsMacport: add cf-private

Browse Source 
Also remove incorrect emacs25Macport alias.

    Undefined symbols for architecture x86_64:
      "_CFNotificationCenterAddObserver", referenced from:
          _mac_term_init in macterm.o
          _macfont_copy_available_families_cache in macfont.o
      "_CFNotificationCenterGetDistributedCenter", referenced from:
          _mac_term_init in macterm.o
      "_CFNotificationCenterGetLocalCenter", referenced from:
          _macfont_copy_available_families_cache in macfont.o
      "_CFURLCopyResourcePropertyForKey", referenced from:
          _Fmac_file_alias_p in mac.o
      "_CFURLCreateBookmarkDataFromFile", referenced from:
          _Fmac_file_alias_p in mac.o
      "_CFURLCreateByResolvingBookmarkData", referenced from:
          _Fmac_file_alias_p in mac.o
      "_CFURLResourceIsReachable", referenced from:
          _mac_update_title_bar in macfns.o
          _mac_input_source_properties in macfns.o
      "_NSDefaultRunLoopMode", referenced from:
          -[NSApplication(Emacs) runTemporarilyWithBlock:] in macappkit.o
          ___57-[EmacsController handleQueuedNSEventsWithHoldingQuitIn:]_block_invoke in macappkit.o
          _mac_run_loop_run_once in macappkit.o
          ___mac_run_loop_run_once_block_invoke in macappkit.o
          ___37-[EmacsController(Menu) trackMenuBar]_block_invoke in macappkit.o
          ___create_and_show_dialog_block_invoke.2445 in macappkit.o
          ___mac_select_block_invoke in macappkit.o
          ...
      "_NSURLAttributeModificationDateKey", referenced from:
          _mac_document_create_with_url in macappkit.o
      "_OBJC_CLASS_$_NSArray", referenced from:
          objc-class-ref in macappkit.o
      "_OBJC_CLASS_$_NSData", referenced from:
          l_OBJC_$_CATEGORY_NSData_$_Emacs in macappkit.o
          objc-class-ref in macappkit.o
      "_OBJC_CLASS_$_NSDate", referenced from:
          objc-class-ref in macappkit.o
      "_OBJC_CLASS_$_NSDictionary", referenced from:
          objc-class-ref in macappkit.o
      "_OBJC_CLASS_$_NSMethodSignature", referenced from:
          l_OBJC_$_CATEGORY_NSMethodSignature_$_Emacs in macappkit.o
          objc-class-ref in macappkit.o
      "_OBJC_CLASS_$_NSMutableArray", referenced from:
          l_OBJC_$_CATEGORY_NSMutableArray_$_Emacs in macappkit.o
          objc-class-ref in macappkit.o
      "_OBJC_CLASS_$_NSMutableData", referenced from:
          objc-class-ref in macappkit.o
      "_OBJC_CLASS_$_NSMutableDictionary", referenced from:
          objc-class-ref in macappkit.o
      "_OBJC_CLASS_$_NSMutableSet", referenced from:
          objc-class-ref in macappkit.o
      "_OBJC_CLASS_$_NSNull", referenced from:
          objc-class-ref in macappkit.o
      "_OBJC_CLASS_$_NSRunLoop", referenced from:
          objc-class-ref in macappkit.o
      "_OBJC_CLASS_$_NSSet", referenced from:
          objc-class-ref in macappkit.o
      "_OBJC_CLASS_$_NSTimer", referenced from:
          objc-class-ref in macappkit.o
      "_OBJC_CLASS_$_NSURL", referenced from:
          objc-class-ref in macappkit.o
      "_OBJC_CLASS_$_NSUserDefaults", referenced from:
          objc-class-ref in macappkit.o
      "_OBJC_EHTYPE_$_NSException", referenced from:
          GCC_except_table81 in macappkit.o
          GCC_except_table810 in macappkit.o
      "_kCFURLIsAliasFileKey", referenced from:
          _Fmac_file_alias_p in mac.o
      "_kCFURLIsSymbolicLinkKey", referenced from:
          _Fmac_file_alias_p in mac.o
    ld: symbol(s) not found for architecture x86_64
This commit is contained in:
Daiderd Jordan 2018-11-07 19:33:15 +01:00
parent b378760b08
commit c60816c523
No known key found for this signature in database
GPG Key ID: D02435D05B810C96
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/editors/emacs/macport.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, ncurses, pkgconfig, texinfo, libxml2, gnutls, gettext, autoconf, automake
, AppKit, Carbon, Cocoa, IOKit, OSAKit, Quartz, QuartzCore, WebKit
, cf-private, AppKit, Carbon, Cocoa, IOKit, OSAKit, Quartz, QuartzCore, WebKit
, ImageCaptureCore, GSS, ImageIO # These may be optional
}:
@ -33,6 +33,8 @@ stdenv.mkDerivation rec {
buildInputs = [ ncurses libxml2 gnutls texinfo gettext
AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit
ImageCaptureCore GSS ImageIO # may be optional
# Needed for CFNotificationCenterAddObserver symbols.
cf-private
];
postUnpack = ''

1
pkgs/top-level/aliases.nix
View File

@ -85,7 +85,6 @@ mapAliases ({
docbook_xml_xslt = docbook_xsl; # added 2018-04-25
double_conversion = double-conversion; # 2017-11-22
dwarf_fortress = dwarf-fortress; # added 2016-01-23
emacs25Macport_25_1 = emacs25Macport; # added 2018-04-25
emacsMelpa = emacs25PackagesNg; # for backward compatibility
emacsPackagesGen = emacsPackagesFor; # added 2018-08-18
emacsPackagesNgGen = emacsPackagesNgFor; # added 2018-08-18

4
pkgs/top-level/all-packages.nix
View File

@ -16382,8 +16382,8 @@ with pkgs;
withGTK3 = false;
}));
emacsMacport = emacs25Macport;
emacs25Macport = callPackage ../applications/editors/emacs/macport.nix {
emacsMacport = callPackage ../applications/editors/emacs/macport.nix {
inherit (darwin) cf-private;
inherit (darwin.apple_sdk.frameworks)
AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit
ImageCaptureCore GSS ImageIO;