From 6e99158abb4441f6d2cd4c3176225204c505d657 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 9 Oct 2023 11:38:50 +0200 Subject: gnu: povray: Drop input labels. * gnu/packages/graphics.scm (povray)[inputs]: Remove all input labels. [arguments]: Use G-expression to avoid the use of %build-inputs. --- gnu/packages/graphics.scm | 50 +++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 25 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 9362666274..bdb67a93ef 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2015, 2016, 2021, 2022 Ludovic Courtès ;;; Copyright © 2015 Tomáš Čech ;;; Copyright © 2016, 2019 Leo Famulari -;;; Copyright © 2016, 2017, 2019 Ricardo Wurmus +;;; Copyright © 2016, 2017, 2019, 2023 Ricardo Wurmus ;;; Copyright © 2016, 2018, 2021, 2023 Efraim Flashner ;;; Copyright © 2016 Andreas Enge ;;; Copyright © 2017 Manolis Fragkiskos Ragkousis @@ -1525,32 +1525,32 @@ (define-public povray (native-inputs (list autoconf automake pkg-config)) (inputs - `(("boost" ,boost) - ("libjpeg" ,libjpeg-turbo) - ("libpng" ,libpng) - ("libtiff" ,libtiff) - ("openexr" ,openexr-2) - ("sdl" ,sdl) - ("zlib" ,zlib))) + (list boost + libjpeg-turbo + libpng + libtiff + openexr-2 + sdl + zlib)) (arguments - '(#:configure-flags - (list "COMPILED_BY=Guix" - (string-append "--with-boost-libdir=" - (assoc-ref %build-inputs "boost") "/lib") - "--disable-optimiz-arch") + (list + #:configure-flags + #~(list "COMPILED_BY=Guix" + (string-append "--with-boost-libdir=" + #$(this-package-input "boost") "/lib") + "--disable-optimiz-arch") #:phases - (modify-phases %standard-phases - (add-after 'unpack 'run-prebuild - (lambda _ - (setenv "HOME" (getcwd)) - (with-directory-excursion "unix" - (substitute* "prebuild.sh" - (("/bin/sh") (which "sh"))) - (invoke "sh" "prebuild.sh")) - #t)) - ;; The bootstrap script is run by the prebuild script in the - ;; "run-prebuild" phase. - (delete 'bootstrap)))) + '(modify-phases %standard-phases + (add-after 'unpack 'run-prebuild + (lambda _ + (setenv "HOME" (getcwd)) + (with-directory-excursion "unix" + (substitute* "prebuild.sh" + (("/bin/sh") (which "sh"))) + (invoke "sh" "prebuild.sh")))) + ;; The bootstrap script is run by the prebuild script in the + ;; "run-prebuild" phase. + (delete 'bootstrap)))) (synopsis "Tool for creating three-dimensional graphics") (description "@code{POV-Ray} is short for the Persistence of Vision Raytracer, a tool -- cgit v1.2.3