diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2020-11-19 21:58:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-19 21:58:16 -0500 |
| commit | a44993447728f8f5d897894f5d158aad2305db5e (patch) | |
| tree | 4ee4c387bd0a21534df6227fa9f0609187790a97 /pkgs/applications | |
| parent | 02f13a4245a391514a9278ed210b8831b07af4c3 (diff) | |
| parent | ed047f80bf36cf6c53239bc9b840959188f8ebd7 (diff) | |
Merge pull request #102241 from marsam/emacs27-optional-imagemagick
emacs: make ImageMagick dependency optional in Emacsā„27
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/editors/emacs/generic.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index f2904f3e012b..2de45d03dd6a 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -22,6 +22,7 @@ , srcRepo ? false, autoreconfHook ? null, texinfo ? null , siteStart ? ./site-start.el , nativeComp ? false +, withImageMagick ? lib.versionOlder version "27" && (withX || withNS) , toolkit ? ( if withGTK2 then "gtk2" else if withGTK3 then "gtk3" @@ -101,7 +102,8 @@ in stdenv.mkDerivation { ++ lib.optionals withX [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff libXft gconf cairo ] - ++ lib.optionals (withX || withNS) [ imagemagick librsvg ] + ++ lib.optionals (withX || withNS) [ librsvg ] + ++ lib.optionals withImageMagick [ imagemagick ] ++ lib.optionals (stdenv.isLinux && withX) [ m17n_lib libotf ] ++ lib.optional (withX && withGTK2) gtk2-x11 ++ lib.optionals (withX && withGTK3) [ gtk3-x11 gsettings-desktop-schemas ] @@ -126,6 +128,7 @@ in stdenv.mkDerivation { "--with-gif=no" "--with-tiff=no" ]) ++ lib.optional withXwidgets "--with-xwidgets" ++ lib.optional nativeComp "--with-nativecomp" + ++ lib.optional withImageMagick "--with-imagemagick" ; installTargets = [ "tags" "install" ]; |