From d7e7187f2387424d6b37e903efe4aed809733dd4 Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Mon, 29 Mar 2021 20:14:35 +0200 Subject: [PATCH 10/10] gnu: inkscape-1.0: Do *not* yet use 'imagemagick/stable'. First, will have to be fixed. * gnu/packages/inkscape (inkscape-1.0)[native-inputs]: Do not yet replace 'imagemagick' with 'imagemagick/stable', as 'imagemagick' ends up in the closure. --- gnu/packages/inkscape.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm index 075f901b2d..3b774ceaa1 100644 --- a/gnu/packages/inkscape.scm +++ b/gnu/packages/inkscape.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2020 Maxim Cournoyer ;;; Copyright © 2020 Boris A. Dekshteyn ;;; Copyright © 2020 Ekaitz Zarraga +;;; Copyright © 2021 Maxim Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -221,6 +222,11 @@ endif()~%~%" #:modules ((guix build cmake-build-system) ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) (guix build utils)) + ;; TODO: uncomment this when + ;; has been fixed. + ;; Prevent the 'imagemagick/stable' package from ending + ;; up in the closure. + ;; #:disallowed-references (,imagemagick/stable) #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-icon-cache-generator @@ -291,6 +297,9 @@ endif()~%~%" ("python-numpy" ,python-numpy) ("python-lxml" ,python-lxml))) (native-inputs + ;; TODO: it would be nice to use 'imagemagick/stable' here, + ;; but that is not possible yet. See + ;; . `(("imagemagick" ,imagemagick) ;for tests ("intltool" ,intltool) ("glib" ,glib "bin") -- 2.31.1