alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #102241 from marsam/emacs27-optional-imagemagick

Browse source 
emacs: make ImageMagick dependency optional in Emacs≥27
This commit is contained in:
Mario Rodas 2020-11-19 21:58:16 -05:00 committed by GitHub
parent 02f13a4245 ed047f80bf
commit a449934477
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/applications/editors/emacs/generic.nix
View file

@ -22,6 +22,7 @@
, srcRepo ? false, autoreconfHook ? null, texinfo ? null , srcRepo ? false, autoreconfHook ? null, texinfo ? null
, siteStart ? ./site-start.el , siteStart ? ./site-start.el
, nativeComp ? false , nativeComp ? false
, withImageMagick ? lib.versionOlder version "27" && (withX || withNS)
, toolkit ? ( , toolkit ? (
if withGTK2 then "gtk2" if withGTK2 then "gtk2"
else if withGTK3 then "gtk3" else if withGTK3 then "gtk3"
@ -101,7 +102,8 @@ in stdenv.mkDerivation {
++ lib.optionals withX ++ lib.optionals withX
[ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff libXft [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff libXft
gconf cairo ] 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.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 ]
@ -126,6 +128,7 @@ in stdenv.mkDerivation {
"--with-gif=no" "--with-tiff=no" ]) "--with-gif=no" "--with-tiff=no" ])
++ lib.optional withXwidgets "--with-xwidgets" ++ lib.optional withXwidgets "--with-xwidgets"
++ lib.optional nativeComp "--with-nativecomp" ++ lib.optional nativeComp "--with-nativecomp"
++ lib.optional withImageMagick "--with-imagemagick"
; ;
installTargets = [ "tags" "install" ]; installTargets = [ "tags" "install" ];