pyrox.dev
Merge pull request #269009 from slotThe/emacs/withFeature
emacs: Use lib.withFeature
+10
-9
pkgs/applications/editors/emacs/make-emacs.nix
+10
-9
pkgs/applications/editors/emacs/make-emacs.nix
···
329
329
"--with-xml2=yes"
330
330
]
331
331
++ (lib.optional stdenv.isDarwin (lib.withFeature withNS "ns"))
332
-
++ lib.optional (!withToolkitScrollBars) "--without-toolkit-scroll-bars"
333
-
++ lib.optional withNativeCompilation "--with-native-compilation"
334
-
++ lib.optional withImageMagick "--with-imagemagick"
335
-
++ lib.optional withTreeSitter "--with-tree-sitter"
336
-
++ lib.optional withXinput2 "--with-xinput2"
337
-
++ lib.optional withXwidgets "--with-xwidgets"
338
-
++ lib.optional withSmallJaDic "--with-small-ja-dic"
339
-
++ lib.optional (!withCompressInstall) "--without-compress-install"
340
-
;
332
+
++ [
333
+
(lib.withFeature withCompressInstall "compress-install")
334
+
(lib.withFeature withToolkitScrollBars "toolkit-scroll-bars")
335
+
(lib.withFeature withNativeCompilation "native-compilation")
336
+
(lib.withFeature withImageMagick "imagemagick")
337
+
(lib.withFeature withSmallJaDic "small-ja-dic")
338
+
(lib.withFeature withTreeSitter "tree-sitter")
339
+
(lib.withFeature withXinput2 "xinput2")
340
+
(lib.withFeature withXwidgets "xwidgets")
341
+
];
341
342
342
343
env = lib.optionalAttrs withNativeCompilation {
343
344
NATIVE_FULL_AOT = "1";