diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-11-14 13:16:25 +0100 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-11-14 13:16:34 +0100 |
| commit | 3c336a1647ada0970b71284cceb601c3d79c2134 (patch) | |
| tree | dea9a6a0eb8673bf86ce7d114b09688d11356a46 /pkgs/applications/editors | |
| parent | 2605fad79520679232edcf4de591013d7b34b0a5 (diff) | |
| parent | bf744fe90419885eefced41b3e5ae442d732712d (diff) | |
| download | nixpkgs-3c336a1647ada0970b71284cceb601c3d79c2134.tar nixpkgs-3c336a1647ada0970b71284cceb601c3d79c2134.tar.gz nixpkgs-3c336a1647ada0970b71284cceb601c3d79c2134.tar.bz2 nixpkgs-3c336a1647ada0970b71284cceb601c3d79c2134.tar.lz nixpkgs-3c336a1647ada0970b71284cceb601c3d79c2134.tar.xz nixpkgs-3c336a1647ada0970b71284cceb601c3d79c2134.tar.zst nixpkgs-3c336a1647ada0970b71284cceb601c3d79c2134.zip | |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: - pkgs/development/libraries/gdcm/default.nix
Diffstat (limited to 'pkgs/applications/editors')
| -rw-r--r-- | pkgs/applications/editors/emacs/make-emacs.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix index d3aabb739ec..c5cc91c1268 100644 --- a/pkgs/applications/editors/emacs/make-emacs.nix +++ b/pkgs/applications/editors/emacs/make-emacs.nix @@ -89,6 +89,7 @@ , withX ? !(stdenv.isDarwin || noGui || withPgtk) , withXinput2 ? withX && lib.versionAtLeast version "29" , withXwidgets ? !stdenv.isDarwin && !noGui && (withGTK3 || withPgtk) +, withSmallJaDic ? false # Options , siteStart ? ./site-start.el @@ -337,6 +338,7 @@ mkDerivation (finalAttrs: { ++ lib.optional withTreeSitter "--with-tree-sitter" ++ lib.optional withXinput2 "--with-xinput2" ++ lib.optional withXwidgets "--with-xwidgets" + ++ lib.optional withSmallJaDic "--with-small-ja-dic" ; env = lib.optionalAttrs withNativeCompilation { |