diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-07-17 10:07:01 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-17 10:07:01 -0400 |
| commit | 2255f292063ccbe184ff8f9b35ce475c04d5ae69 (patch) | |
| tree | 3759419b78fc4fea0a0b1c9b43cb298c0b5d97e3 /pkgs/applications/editors/emacs | |
| parent | d958135a2fd21d5b698281ae6f23177d3110445f (diff) | |
| parent | 9339970dbff75ae1ea6eb3d787ba50189b1b271a (diff) | |
| download | nixlib-2255f292063ccbe184ff8f9b35ce475c04d5ae69.tar nixlib-2255f292063ccbe184ff8f9b35ce475c04d5ae69.tar.gz nixlib-2255f292063ccbe184ff8f9b35ce475c04d5ae69.tar.bz2 nixlib-2255f292063ccbe184ff8f9b35ce475c04d5ae69.tar.lz nixlib-2255f292063ccbe184ff8f9b35ce475c04d5ae69.tar.xz nixlib-2255f292063ccbe184ff8f9b35ce475c04d5ae69.tar.zst nixlib-2255f292063ccbe184ff8f9b35ce475c04d5ae69.zip | |
Merge pull request #64901 from dgchurchill/emacs-imagemagick-macos
emacs: Also allow imagemagick dependency when using withNS
Diffstat (limited to 'pkgs/applications/editors/emacs')
| -rw-r--r-- | pkgs/applications/editors/emacs/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index 2de76675c128..4c95681c43de 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -61,7 +61,8 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.isLinux [ dbus libselinux systemd ] ++ lib.optionals withX [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft - imagemagick gconf ] + gconf ] + ++ lib.optionals (withX || withNS) [ imagemagick ] ++ lib.optionals (stdenv.isLinux && withX) [ m17n_lib libotf ] ++ lib.optional (withX && withGTK2) gtk2-x11 ++ lib.optionals (withX && withGTK3) [ gtk3-x11 gsettings-desktop-schemas ] |