diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2020-03-18 13:48:35 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-18 13:48:35 -0400 |
| commit | bd15dfa21b0487b41077a23c87fe4d23db055203 (patch) | |
| tree | 010ca593a19bf29dc5123c47091f9730aee4685d | |
| parent | 053ad4e0db7241ae6a02394d62750fdc5d64aa9f (diff) | |
| parent | 0d09b7025bc6a3299b7dd745ce38ba694c3b5569 (diff) | |
| download | nixlib-bd15dfa21b0487b41077a23c87fe4d23db055203.tar nixlib-bd15dfa21b0487b41077a23c87fe4d23db055203.tar.gz nixlib-bd15dfa21b0487b41077a23c87fe4d23db055203.tar.bz2 nixlib-bd15dfa21b0487b41077a23c87fe4d23db055203.tar.lz nixlib-bd15dfa21b0487b41077a23c87fe4d23db055203.tar.xz nixlib-bd15dfa21b0487b41077a23c87fe4d23db055203.tar.zst nixlib-bd15dfa21b0487b41077a23c87fe4d23db055203.zip | |
Merge pull request #82853 from sepiabrown/patch-2
glib-networking for TLS/SSL network (https://) in xwidget
| -rw-r--r-- | pkgs/applications/editors/emacs/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index 1ab22a73c635..2b40eb77e2cf 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -7,7 +7,7 @@ , withNS ? stdenv.isDarwin , withGTK2 ? false, gtk2-x11 ? null , withGTK3 ? true, gtk3-x11 ? null, gsettings-desktop-schemas ? null -, withXwidgets ? false, webkitgtk ? null, wrapGAppsHook ? null +, withXwidgets ? false, webkitgtk ? null, wrapGAppsHook ? null, glib-networking ? null , withCsrc ? true , srcRepo ? false, autoconf ? null, automake ? null, texinfo ? null , siteStart ? ./site-start.el @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { ++ lib.optional (withX && withGTK2) gtk2-x11 ++ lib.optionals (withX && withGTK3) [ gtk3-x11 gsettings-desktop-schemas ] ++ lib.optional (stdenv.isDarwin && withX) cairo - ++ lib.optionals (withX && withXwidgets) [ webkitgtk ] + ++ lib.optionals (withX && withXwidgets) [ webkitgtk glib-networking ] ++ lib.optionals withNS [ AppKit GSS ImageIO ]; hardeningDisable = [ "format" ]; |