dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

emacs generic: decouple Xwidgets from X

Browse Source
This commit is contained in:
Anderson Torres 2023-06-03 15:34:33 -03:00
parent 441036d7f9
commit 196d71b295
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/editors/emacs/generic.nix
View File

@ -94,7 +94,7 @@
, withWebP ? lib.versionAtLeast version "29"
, withX ? !(stdenv.isDarwin || noGui || withPgtk)
, withXinput2 ? withX && lib.versionAtLeast version "29"
, withXwidgets ? false
, withXwidgets ? !noGui && (withGTK3 || withPgtk)
# Options
, siteStart ? ./site-start.el
@ -118,7 +118,7 @@ assert withGconf -> withX;
assert withGpm -> stdenv.isLinux;
assert withNS -> stdenv.isDarwin && !(withX || variant == "macport");
assert withPgtk -> withGTK3 && !withX;
assert withXwidgets -> withGTK3;
assert withXwidgets -> !noGui && (withGTK3 || withPgtk);
let
libGccJitLibraryPaths = [
@ -241,7 +241,6 @@ mkDerivation (finalAttrs: (lib.optionalAttrs nativeComp {
motif
] ++ lib.optionals (withX && withXwidgets) [
glib-networking
webkitgtk
] ++ lib.optionals nativeComp [
libgccjit
] ++ lib.optionals withImageMagick [
@ -265,7 +264,6 @@ mkDerivation (finalAttrs: (lib.optionalAttrs nativeComp {
] ++ lib.optionals withX [
Xaw3d
cairo
giflib
libXaw
libXpm
@ -273,6 +271,8 @@ mkDerivation (finalAttrs: (lib.optionalAttrs nativeComp {
libpng
librsvg
libtiff
] ++ lib.optionals withXwidgets [
webkitgtk
] ++ lib.optionals stdenv.isDarwin [
sigtool
] ++ lib.optionals withNS [