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

emacs: Also allow imagemagick dependency when using withNS

Browse Source 
This allows Emacs to be used with imagemagick on macOS.
This commit is contained in:
Dave Churchill 2019-07-16 22:05:20 +10:00
parent 2af6760541
commit 9339970dbf
1 changed files with 2 additions and 1 deletions
Show Stats 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 stdenv.isLinux [ dbus libselinux systemd ]
++ lib.optionals withX ++ lib.optionals withX
[ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft [ 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.optionals (stdenv.isLinux && withX) [ m17n_lib libotf ]
++ lib.optional (withX && withGTK2) gtk2-x11 ++ lib.optional (withX && withGTK2) gtk2-x11
++ lib.optionals (withX && withGTK3) [ gtk3-x11 gsettings-desktop-schemas ] ++ lib.optionals (withX && withGTK3) [ gtk3-x11 gsettings-desktop-schemas ]