From 7293fa61d4f1a424c7f0b01600329a660a571afb Mon Sep 17 00:00:00 2001 From: Janneke Nieuwenhuizen Date: Fri, 3 Jan 2025 18:54:57 +0100 Subject: [PATCH] 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 --- gnu/packages/tcl.scm | 16 +++++++--------- 1 file 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 @@ (define-module (gnu packages tcl) #: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 @@ (define-public perl-tk "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: . - #:parallel-build? #f)) + (list + #:make-maker-flags #~(list (string-append "X11=" #$libx11)) + ;; Fails to build in parallel: . + #:parallel-build? #f)) (synopsis "Graphical user interface toolkit for Perl") (description "Tk is a Graphical User Interface ToolKit.")