diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2019-06-19 21:55:10 +0200 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2019-07-03 22:20:19 +0200 |
| commit | f2d2381838cb2d45653da0278eb36809b2c35cf0 (patch) | |
| tree | 57833ee18ee930ab32e91f62b1e7608151c7875e /pkgs/applications/editors/emacs | |
| parent | 35b7c60c0c6f57bb073840a7529be7c272acf005 (diff) | |
| download | nixpkgs-f2d2381838cb2d45653da0278eb36809b2c35cf0.tar nixpkgs-f2d2381838cb2d45653da0278eb36809b2c35cf0.tar.gz nixpkgs-f2d2381838cb2d45653da0278eb36809b2c35cf0.tar.bz2 nixpkgs-f2d2381838cb2d45653da0278eb36809b2c35cf0.tar.lz nixpkgs-f2d2381838cb2d45653da0278eb36809b2c35cf0.tar.xz nixpkgs-f2d2381838cb2d45653da0278eb36809b2c35cf0.tar.zst nixpkgs-f2d2381838cb2d45653da0278eb36809b2c35cf0.zip | |
emacs: remove cf-private
Diffstat (limited to 'pkgs/applications/editors/emacs')
| -rw-r--r-- | pkgs/applications/editors/emacs/25.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/editors/emacs/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/editors/emacs/macport.nix | 4 |
3 files changed, 5 insertions, 15 deletions
diff --git a/pkgs/applications/editors/emacs/25.nix b/pkgs/applications/editors/emacs/25.nix index 852faeb7918..76009370473 100644 --- a/pkgs/applications/editors/emacs/25.nix +++ b/pkgs/applications/editors/emacs/25.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d , pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif , libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux -, alsaLib, cairo, acl, gpm, cf-private, AppKit, GSS, ImageIO +, alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO , withX ? !stdenv.isDarwin , withGTK2 ? false, gtk2 ? null , withGTK3 ? true, gtk3 ? null, gsettings-desktop-schemas ? null @@ -62,11 +62,7 @@ stdenv.mkDerivation rec { ++ lib.optionals (withX && withGTK3) [ gtk3 gsettings-desktop-schemas ] ++ lib.optional (stdenv.isDarwin && withX) cairo ++ lib.optionals (withX && withXwidgets) [ webkitgtk24x-gtk3 glib-networking ] - ++ lib.optionals stdenv.isDarwin [ - AppKit GSS ImageIO - # Needed for CFNotificationCenterAddObserver symbols. - cf-private - ]; + ++ lib.optionals stdenv.isDarwin [ AppKit GSS ImageIO ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index c2756eab961..2de76675c12 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm , Xaw3d, libXcursor, pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif , libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux -, alsaLib, cairo, acl, gpm, cf-private, AppKit, GSS, ImageIO, m17n_lib, libotf +, alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf , systemd ? null , withX ? !stdenv.isDarwin , withNS ? stdenv.isDarwin @@ -67,11 +67,7 @@ stdenv.mkDerivation rec { ++ lib.optionals (withX && withGTK3) [ gtk3-x11 gsettings-desktop-schemas ] ++ lib.optional (stdenv.isDarwin && withX) cairo ++ lib.optionals (withX && withXwidgets) [ webkitgtk ] - ++ lib.optionals withNS [ - AppKit GSS ImageIO - # Needed for CFNotificationCenterAddObserver symbols. - cf-private - ]; + ++ lib.optionals withNS [ AppKit GSS ImageIO ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/editors/emacs/macport.nix b/pkgs/applications/editors/emacs/macport.nix index 7c21c1cae5e..d51391595f4 100644 --- a/pkgs/applications/editors/emacs/macport.nix +++ b/pkgs/applications/editors/emacs/macport.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, ncurses, pkgconfig, texinfo, libxml2, gnutls, gettext, autoconf, automake -, cf-private, AppKit, Carbon, Cocoa, IOKit, OSAKit, Quartz, QuartzCore, WebKit +, AppKit, Carbon, Cocoa, IOKit, OSAKit, Quartz, QuartzCore, WebKit , ImageCaptureCore, GSS, ImageIO # These may be optional }: @@ -33,8 +33,6 @@ 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 = '' |