From 279b0122b63502f1d5ea027025dcc4dd4180e478 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Fri, 24 Feb 2023 14:43:07 +0100
Subject: gnu: perl-gd: Remove input labels.

* gnu/packages/gd.scm (perl-gd)[inputs]: Remove labels.
---
 gnu/packages/gd.scm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'gnu/packages/gd.scm')

diff --git a/gnu/packages/gd.scm b/gnu/packages/gd.scm
index 9e422dbe97..02e05c6072 100644
--- a/gnu/packages/gd.scm
+++ b/gnu/packages/gd.scm
@@ -108,12 +108,12 @@ most common applications of GD involve website development.")
         (base32 "0arjpa8id6k5yjxfq0j2hsinhhjzjch5lwk6gscf48l54drrw729"))))
     (build-system perl-build-system)
     (inputs
-     `(("fontconfig" ,fontconfig)
-       ("freetype" ,freetype)
-       ("gd" ,gd)
-       ("libpng" ,libpng)
-       ("libjpeg" ,libjpeg-turbo)
-       ("zlib" ,zlib)))
+     (list fontconfig
+           freetype
+           gd
+           libpng
+           libjpeg-turbo
+           zlib))
     (native-inputs
      (list perl-extutils-pkgconfig))
     (arguments
-- 
cgit v1.2.3


From 5c4240442cd39fd5d279e080184f0ee2fb1c8af4 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Fri, 24 Feb 2023 14:53:56 +0100
Subject: gnu: perl-gd: Use gexps.

This helps cross-compilation: in that case, '%build-inputs' was unbound.

* gnu/packages/gd.scm (perl-gd)[arguments]: Rewrite using gexps.
---
 gnu/packages/gd.scm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'gnu/packages/gd.scm')

diff --git a/gnu/packages/gd.scm b/gnu/packages/gd.scm
index 02e05c6072..90023ddc84 100644
--- a/gnu/packages/gd.scm
+++ b/gnu/packages/gd.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2016 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2016, 2023 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2015, 2016 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name>
@@ -23,6 +23,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages gd)
+  #:use-module (guix gexp)
   #:use-module (guix packages)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system perl)
@@ -117,9 +118,9 @@ most common applications of GD involve website development.")
     (native-inputs
      (list perl-extutils-pkgconfig))
     (arguments
-     `(#:make-maker-flags
-       (list (string-append "--lib_jpeg_path="
-                            (assoc-ref %build-inputs "libjpeg")))))
+     (list #:make-maker-flags
+           #~(list (string-append "--lib_jpeg_path="
+                                  #$(this-package-input "libjpeg-turbo")))))
     (home-page "https://metacpan.org/release/GD")
     (synopsis "Perl interface to the GD graphics library")
     (description "GD.pm is an autoloadable interface module for libgd, a
-- 
cgit v1.2.3