swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 12:59:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

emacs: Use lib.withFeature

Browse source 
As discussed in [1], this improves readability.

Not all --with options have a corresponding --without (and vice-versa),
but Emacs's configure script can endure this. Additionally, this
"encodes" the default options in system-configuration-options.

[1]: https://github.com/NixOS/nixpkgs/pull/267946#issuecomment-1815394037
This commit is contained in:
Tony Zorman 2023-11-20 08:19:40 +01:00
parent 26dc877716
commit 4a6045a41b
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
pkgs/applications/editors/emacs/make-emacs.nix
View file

@ -329,15 +329,16 @@ mkDerivation (finalAttrs: {
"--with-xml2=yes"
]
++ (lib.optional stdenv.isDarwin (lib.withFeature withNS "ns"))
++ lib.optional (!withToolkitScrollBars) "--without-toolkit-scroll-bars"
++ lib.optional withNativeCompilation "--with-native-compilation"
++ lib.optional withImageMagick "--with-imagemagick"
++ lib.optional withTreeSitter "--with-tree-sitter"
++ lib.optional withXinput2 "--with-xinput2"
++ lib.optional withXwidgets "--with-xwidgets"
++ lib.optional withSmallJaDic "--with-small-ja-dic"
++ lib.optional (!withCompressInstall) "--without-compress-install"
;
++ [
(lib.withFeature withCompressInstall "compress-install")
(lib.withFeature withToolkitScrollBars "toolkit-scroll-bars")
(lib.withFeature withNativeCompilation "native-compilation")
(lib.withFeature withImageMagick "imagemagick")
(lib.withFeature withSmallJaDic "small-ja-dic")
(lib.withFeature withTreeSitter "tree-sitter")
(lib.withFeature withXinput2 "xinput2")
(lib.withFeature withXwidgets "xwidgets")
];
env = lib.optionalAttrs withNativeCompilation {
NATIVE_FULL_AOT = "1";