public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #64901 from dgchurchill/emacs-imagemagick-macos

Browse Source 
emacs: Also allow imagemagick dependency when using withNS
This commit is contained in:
Matthew Bauer
2019-07-17 10:07:01 -04:00
committed by GitHub
parent d958135a2f 9339970dbf
commit 2255f29206
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/editors/emacs/default.nix
View File

@@ -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 ]