Merge pull request #82853 from sepiabrown/patch-2
glib-networking for TLS/SSL network (https://) in xwidget
This commit is contained in:
commit
bd15dfa21b
|
@ -7,7 +7,7 @@
|
||||||
, withNS ? stdenv.isDarwin
|
, withNS ? stdenv.isDarwin
|
||||||
, withGTK2 ? false, gtk2-x11 ? null
|
, withGTK2 ? false, gtk2-x11 ? null
|
||||||
, withGTK3 ? true, gtk3-x11 ? null, gsettings-desktop-schemas ? 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
|
, withCsrc ? true
|
||||||
, srcRepo ? false, autoconf ? null, automake ? null, texinfo ? null
|
, srcRepo ? false, autoconf ? null, automake ? null, texinfo ? null
|
||||||
, siteStart ? ./site-start.el
|
, siteStart ? ./site-start.el
|
||||||
|
@ -67,7 +67,7 @@ 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 glib-networking ]
|
||||||
++ lib.optionals withNS [ AppKit GSS ImageIO ];
|
++ lib.optionals withNS [ AppKit GSS ImageIO ];
|
||||||
|
|
||||||
hardeningDisable = [ "format" ];
|
hardeningDisable = [ "format" ];
|
||||||
|
|
Loading…
Reference in a new issue