From b677178d5cd5bd1cb9ba95400dbb136d4fc8caf3 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Sun, 17 Oct 2021 16:43:23 +0200 Subject: Find a better inkscape --- guix/vkraus/packages/manuscript.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/guix/vkraus/packages/manuscript.scm b/guix/vkraus/packages/manuscript.scm index bd292f3..1332c61 100644 --- a/guix/vkraus/packages/manuscript.scm +++ b/guix/vkraus/packages/manuscript.scm @@ -26,6 +26,13 @@ (gnu packages ghostscript) (vkraus packages h4sp)) +(define inkscape>=1 + (if (string-prefix? "0." (package-version inkscape)) + ;; Use inkscape-1.1 + (module-ref (resolve-interface '(gnu packages inkscape)) + 'inkscape-1.1) + inkscape)) + (define r-lamw (package (name "r-lamw") @@ -233,7 +240,7 @@ #t))))) (native-inputs `(("texlive" ,texlive) - ("inkscape" ,inkscape-1.1) + ("inkscape" ,inkscape>=1) ("r" ,r) ("r-ggplot2" ,r-ggplot2) ("r-magrittr" ,r-magrittr) -- cgit v1.2.3