From a99565139fb29eb2ba164bc2bd1ff344348dda4b Mon Sep 17 00:00:00 2001 From: Suwon Park <35622998+sepiabrown@users.noreply.github.com> Date: Wed, 18 Mar 2020 23:03:17 +0900 Subject: [PATCH 1/2] glib-networking for TLS/SSL network (https://) in xwidget https://github.com/NixOS/nixpkgs/commit/ea5bcb78c2cc4dd7ed0ef58c21a962c9ffbd64cb#r31513119 He accidently errased the glib-networking. But it is needed for TLS/SSL networking. --- pkgs/applications/editors/emacs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index 1ab22a73c63..b6e9a4588b5 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" ]; From 0d09b7025bc6a3299b7dd745ce38ba694c3b5569 Mon Sep 17 00:00:00 2001 From: Suwon Park <35622998+sepiabrown@users.noreply.github.com> Date: Wed, 18 Mar 2020 23:20:28 +0900 Subject: [PATCH 2/2] accidently added semicolon Oops --- pkgs/applications/editors/emacs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index b6e9a4588b5..2b40eb77e2c 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -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 glib-networking ]; + ++ lib.optionals (withX && withXwidgets) [ webkitgtk glib-networking ] ++ lib.optionals withNS [ AppKit GSS ImageIO ]; hardeningDisable = [ "format" ];