diff options
| author | Dave Churchill <dave@ninthcuriosity.com> | 2019-07-16 22:05:20 +1000 |
|---|---|---|
| committer | Dave Churchill <dave@ninthcuriosity.com> | 2019-07-16 22:09:43 +1000 |
| commit | 9339970dbff75ae1ea6eb3d787ba50189b1b271a (patch) | |
| tree | 460916df20a12daf4df9f6238b0f0828bc5b77e6 /pkgs/applications/editors/emacs | |
| parent | 2af6760541361351fb9a6b6f6a4a44d8367b7605 (diff) | |
| download | nixlib-9339970dbff75ae1ea6eb3d787ba50189b1b271a.tar nixlib-9339970dbff75ae1ea6eb3d787ba50189b1b271a.tar.gz nixlib-9339970dbff75ae1ea6eb3d787ba50189b1b271a.tar.bz2 nixlib-9339970dbff75ae1ea6eb3d787ba50189b1b271a.tar.lz nixlib-9339970dbff75ae1ea6eb3d787ba50189b1b271a.tar.xz nixlib-9339970dbff75ae1ea6eb3d787ba50189b1b271a.tar.zst nixlib-9339970dbff75ae1ea6eb3d787ba50189b1b271a.zip | |
emacs: Also allow imagemagick dependency when using withNS
This allows Emacs to be used with imagemagick on macOS.
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 c2756eab961a..7ae0ecfd7431 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 ] |