summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJanneke Nieuwenhuizen <janneke@gnu.org>2025-01-03 18:54:57 +0100
committerAndreas Enge <andreas@enge.fr>2025-07-18 20:17:24 +0200
commitf68a3caae80a88e72f0524f01ed9217828406223 (patch)
tree7b35f157dcd1e4701ad0e22e0a9f15d313f74abe
parent018ae2deb9c7e6eef55a42bdba40b749725f7a0f (diff)
gnu: perl-tk: Build with gcc-12.
* gnu/packages/tcl.scm (perl-tk)[inputs]: Remove labels. Add gcc-12. [arguments]: Use G-Expressions. Change-Id: I648817749e6b66ec7c650f13fe35a556b53fd33c
-rw-r--r--gnu/packages/tcl.scm16
1 files changed, 7 insertions, 9 deletions
diff --git a/gnu/packages/tcl.scm b/gnu/packages/tcl.scm
index 0d9c7909b6..c2cdbd8a03 100644
--- a/gnu/packages/tcl.scm
+++ b/gnu/packages/tcl.scm
@@ -34,8 +34,9 @@
#:use-module (guix build-system go)
#:use-module (guix build-system perl)
#:use-module (gnu packages)
- #:use-module (gnu packages image)
#:use-module (gnu packages fontutils)
+ #:use-module (gnu packages gcc)
+ #:use-module (gnu packages image)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages tls)
@@ -278,15 +279,12 @@ interfaces (GUIs) in the Tcl language.")
"0pha40m97fzafjnq8vwkbi5sml6xv8jki6qi60rxrzmxlrqp5aij"))))
(build-system perl-build-system)
(native-inputs (list pkg-config))
- (inputs `(("libx11" ,libx11)
- ("libpng" ,libpng)
- ("libjpeg" ,libjpeg-turbo)))
+ (inputs (list gcc-12 libx11 libpng libjpeg-turbo))
(arguments
- `(#:make-maker-flags `(,(string-append
- "X11=" (assoc-ref %build-inputs "libx11")))
-
- ;; Fails to build in parallel: <http://bugs.gnu.org/18262>.
- #:parallel-build? #f))
+ (list
+ #:make-maker-flags #~(list (string-append "X11=" #$libx11))
+ ;; Fails to build in parallel: <http://bugs.gnu.org/18262>.
+ #:parallel-build? #f))
(synopsis "Graphical user interface toolkit for Perl")
(description
"Tk is a Graphical User Interface ToolKit.")