180/246: Revert "gnu: perl-tk: Fix build with gcc-14."

[guix-commits]

janneke pushed a commit to branch core-packages-team
in repository guix.

commit 1c3a8332545bddbf7c925beb5bead01b65c600ca
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Fri Jan 3 18:53:08 2025 +0100

    Revert "gnu: perl-tk: Fix build with gcc-14."
    
    This is beyond hope
    
        tkGlue.c:5262:46: error: macro "pregcomp" passed 3 arguments, but takes 
just 2
         5262 |  p->pat = pregcomp(string,string+len,p->flags);
              |                                              ^
        
/gnu/store/kpj90nrq7d59xhbk2pfmzyvv5dya0sfr-perl-5.36.0/lib/perl5/5.36.0/x86_64-linux-thread-multi/CORE/embed.h:464:9:
 note: macro "pregcomp" defined here
    
    This reverts commit a85225586b4669c893efb3b391543ae6a47eb8ea.
    
    Change-Id: Id0de592e39fb5f33e225289e86ac76121e6e6fea
---
 gnu/packages/tcl.scm | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/tcl.scm b/gnu/packages/tcl.scm
index 3e4113d2ed..0d9c7909b6 100644
--- a/gnu/packages/tcl.scm
+++ b/gnu/packages/tcl.scm
@@ -278,19 +278,15 @@ interfaces (GUIs) in the Tcl language.")
                "0pha40m97fzafjnq8vwkbi5sml6xv8jki6qi60rxrzmxlrqp5aij"))))
     (build-system perl-build-system)
     (native-inputs (list pkg-config))
-    (inputs (list libx11 libpng libjpeg-turbo))
+    (inputs `(("libx11" ,libx11)
+              ("libpng" ,libpng)
+              ("libjpeg" ,libjpeg-turbo)))
     (arguments
-     (list
-      #:make-maker-flags
-      #~(list (string-append "X11=" #$libx11)
-              ;; Using CFLAGS partly works but also creates a broken Makefile
-              #$(string-append "CC=gcc"
-                               " -Wno-error=implicit-function-declaration"
-                               " -Wno-error=implicit-int"
-                               " -Wno-error=incompatible-pointer-types"
-                               " -Wno-error=int-to-pointer-cast"))
-      ;; Fails to build in parallel: <http://bugs.gnu.org/18262>.
-      #:parallel-build? #f))
+     `(#:make-maker-flags `(,(string-append
+                              "X11=" (assoc-ref %build-inputs "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.")