diff options
| author | adisbladis <adisbladis@gmail.com> | 2020-05-23 22:32:46 +0100 |
|---|---|---|
| committer | adisbladis <adisbladis@gmail.com> | 2020-05-23 22:34:26 +0100 |
| commit | 2b520b08d9575387407d9247444275011148d775 (patch) | |
| tree | a24188790a01878651b13c036b28ff05081ce096 /pkgs/applications/editors/emacs/default.nix | |
| parent | 64f8baf1087016905e39ece1cbfe1ec61cf337e5 (diff) | |
| download | nixlib-2b520b08d9575387407d9247444275011148d775.tar nixlib-2b520b08d9575387407d9247444275011148d775.tar.gz nixlib-2b520b08d9575387407d9247444275011148d775.tar.bz2 nixlib-2b520b08d9575387407d9247444275011148d775.tar.lz nixlib-2b520b08d9575387407d9247444275011148d775.tar.xz nixlib-2b520b08d9575387407d9247444275011148d775.tar.zst nixlib-2b520b08d9575387407d9247444275011148d775.zip | |
emacs: Move toolkit to function arguments
It's possible to build Emacs without any toolkits which uses xlib.
Diffstat (limited to 'pkgs/applications/editors/emacs/default.nix')
| -rw-r--r-- | pkgs/applications/editors/emacs/default.nix | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index 2d48da0eb281..570dc28c684f 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -11,6 +11,10 @@ , withCsrc ? true , srcRepo ? false, autoconf ? null, automake ? null, texinfo ? null , siteStart ? ./site-start.el +, toolkit ? ( + if withGTK2 then "gtk2" + else if withGTK3 then "gtk3" + else "lucid") }: assert (libXft != null) -> libpng != null; # probably a bug @@ -23,12 +27,7 @@ assert withGTK2 -> !withGTK3 && gtk2-x11 != null; assert withGTK3 -> !withGTK2 && gtk3-x11 != null; assert withXwidgets -> withGTK3 && webkitgtk != null; -let - toolkit = - if withGTK2 then "gtk2" - else if withGTK3 then "gtk3" - else "lucid"; -in + stdenv.mkDerivation rec { name = "emacs-${version}${versionModifier}"; version = "26.3"; |