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

emacs: include cf-private on darwin and don't propagate frameworks

Browse Source 
Undefined symbols for architecture x86_64:
      "_CFNotificationCenterAddObserver", referenced from:
          _macfont_copy_available_families_cache in macfont.o
      "_CFNotificationCenterGetLocalCenter", referenced from:
          _macfont_copy_available_families_cache in macfont.o
      "_NSDefaultRunLoopMode", referenced from:
          _ns_send_appdefined in nsterm.o
          -[EmacsApp run] in nsterm.o
      "_OBJC_CLASS_$_NSArray", referenced from:
          objc-class-ref in nsterm.o
          objc-class-ref in nsmenu.o
          objc-class-ref in nsselect.o
      "_OBJC_CLASS_$_NSData", referenced from:
          objc-class-ref in nsimage.o
      "_OBJC_CLASS_$_NSDate", referenced from:
          objc-class-ref in nsterm.o
      "_OBJC_CLASS_$_NSDictionary", referenced from:
          objc-class-ref in macfont.o
      "_OBJC_CLASS_$_NSLocale", referenced from:
          objc-class-ref in nsterm.o
      "_OBJC_CLASS_$_NSMutableArray", referenced from:
          objc-class-ref in nsterm.o
          objc-class-ref in nsmenu.o
      "_OBJC_CLASS_$_NSMutableDictionary", referenced from:
          objc-class-ref in nsmenu.o
          objc-class-ref in nsselect.o
      "_OBJC_CLASS_$_NSMutableSet", referenced from:
          objc-class-ref in nsterm.o
      "_OBJC_CLASS_$_NSRunLoop", referenced from:
          objc-class-ref in nsmenu.o
      "_OBJC_CLASS_$_NSTimer", referenced from:
          objc-class-ref in nsterm.o
          objc-class-ref in nsmenu.o
      "_OBJC_CLASS_$_NSURL", referenced from:
          objc-class-ref in nsterm.o
          objc-class-ref in nsfns.o
      "_OBJC_CLASS_$_NSUserDefaults", referenced from:
          objc-class-ref in nsterm.o
          objc-class-ref in nsfns.o
      "_OBJC_EHTYPE_$_NSException", referenced from:
          GCC_except_table8 in nsterm.o
          GCC_except_table1 in nsselect.o
    ld: symbol(s) not found for architecture x86_64
This commit is contained in:
Daiderd Jordan 2018-11-05 21:11:46 +01:00
parent 86bf715c49
commit f495707eb6
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/applications/editors/emacs/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d { stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d
, pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif , pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif
, libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux , libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux
, alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf , alsaLib, cairo, acl, gpm, cf-private, AppKit, GSS, ImageIO, m17n_lib, libotf
, systemd ? null , systemd ? null
, withX ? !stdenv.isDarwin , withX ? !stdenv.isDarwin
, withNS ? stdenv.isDarwin , withNS ? stdenv.isDarwin
@ -64,9 +64,12 @@ stdenv.mkDerivation rec {
++ lib.optional (withX && withGTK2) gtk2-x11 ++ lib.optional (withX && withGTK2) gtk2-x11
++ lib.optionals (withX && withGTK3) [ gtk3-x11 gsettings-desktop-schemas ] ++ lib.optionals (withX && withGTK3) [ gtk3-x11 gsettings-desktop-schemas ]
++ lib.optional (stdenv.isDarwin && withX) cairo ++ lib.optional (stdenv.isDarwin && withX) cairo
++ lib.optionals (withX && withXwidgets) [ webkitgtk ]; ++ lib.optionals (withX && withXwidgets) [ webkitgtk ]
++ lib.optionals withNS [
propagatedBuildInputs = lib.optionals withNS [ AppKit GSS ImageIO ]; AppKit GSS ImageIO
# Needed for CFNotificationCenterAddObserver symbols.
cf-private
];
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];

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

@ -16313,6 +16313,7 @@ with pkgs;
imagemagick = null; imagemagick = null;
acl = null; acl = null;
gpm = null; gpm = null;
inherit (darwin) cf-private;
inherit (darwin.apple_sdk.frameworks) AppKit GSS ImageIO; inherit (darwin.apple_sdk.frameworks) AppKit GSS ImageIO;
}; };