From 3f9a28a9b0dd8fc6ac5c7324a5612c9e07684c64 Mon Sep 17 00:00:00 2001 From: Jake Forster Date: Tue, 2 Dec 2025 20:28:10 +1030 Subject: [PATCH] gnu: emacs-dicom: Update to 1.2. * gnu/packages/emacs-xyz.scm (emacs-dicom): Update to 1.2. [arguments]<#:phases>{patch-commands}: Patch "dcm2img" and "convert"; do not patch "dcmj2pnm". [inputs]: Add imagemagick. Change-Id: Ifdaa5c562f91dad98f5943fdcc73663b9178fbfb Signed-off-by: Liliana Marie Prikler --- gnu/packages/emacs-xyz.scm | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index e14c3eb204ba50f9abce15170517cd5a9d7a2617..63e20e3974414d82321d175ca546f93b2221a3bb 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2094,23 +2094,27 @@ separate, named tab groups.") (add-after 'unpack 'patch-commands (lambda* (#:key inputs #:allow-other-keys) (make-file-writable "dicom.el") - (let ((dcm2xml (search-input-file inputs "/bin/dcm2xml")) - (dcmj2pnm (search-input-file inputs "/bin/dcmj2pnm")) + (let ((convert (search-input-file inputs "/bin/convert")) + (dcm2img (search-input-file inputs "/bin/dcm2img")) + (dcm2xml (search-input-file inputs "/bin/dcm2xml")) (ffmpeg (search-input-file inputs "/bin/ffmpeg")) (mpv (search-input-file inputs "/bin/mpv"))) (substitute* "dicom.el" + (("(^|[^`])dcm2img" _ start) + (string-append start dcm2img)) (("\"dcm2xml") (string-append "\"" dcm2xml)) - (("\"dcmj2pnm") - (string-append "\"" dcmj2pnm)) (("(^|[^`])ffmpeg" _ start) (string-append start ffmpeg)) + ;; Guix has ImageMagick 6. + (("(^|[^`])magick" _ start) + (string-append start convert)) (("(^|[^`])mpv" _ start) (string-append start mpv)))))) (add-before 'install 'makeinfo (lambda _ (emacs-makeinfo)))))) (native-inputs (list texinfo)) - (inputs (list dcmtk ffmpeg mpv)) + (inputs (list dcmtk ffmpeg imagemagick mpv)) (propagated-inputs (list emacs-compat)) (home-page "https://github.com/minad/dicom") (synopsis