diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-03-23 21:45:21 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-03-23 21:45:21 -0400 |
| commit | 839bb4616f13171a23ad7937bf57d0a01d61d42a (patch) | |
| tree | 01de78a5ce973b9fb7ac0f9216d64f736f8e163d /gnu/packages/gd.scm | |
| parent | 0357bbbcd850f9220078a62da3c30358b8983765 (diff) | |
| parent | ef71e3290916583973724316e815cee840c1b6d8 (diff) | |
Merge remote-tracking branch 'origin/master' into staging.
With resolved conflicts in:
gnu/packages/ibus.scm
gnu/packages/image.scm
gnu/packages/lisp.scm
gnu/packages/virtualization.scm
Diffstat (limited to 'gnu/packages/gd.scm')
| -rw-r--r-- | gnu/packages/gd.scm | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/gnu/packages/gd.scm b/gnu/packages/gd.scm index 9e422dbe97..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) @@ -108,18 +109,18 @@ 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 - `(#: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 |