From 73b21d6ad83f28b2d92c3bf30812b115fab0247d Mon Sep 17 00:00:00 2001 From: Janneke Nieuwenhuizen Date: Thu, 2 Jan 2025 21:13:26 +0100 Subject: [PATCH] Revert "gnu: zsh: Build with gcc-13." This reverts commit dd887f6a84d08f13785198e17f87ad1abbcba010. --- gnu/packages/shells.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 7666b473b4..5b3e695689 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -62,7 +62,6 @@ (define-module (gnu packages shells) #:use-module (gnu packages crypto) #:use-module (gnu packages curl) #:use-module (gnu packages documentation) - #:use-module (gnu packages gcc) #:use-module (gnu packages groff) #:use-module (gnu packages guile) #:use-module (gnu packages libbsd) @@ -500,7 +499,8 @@ (define-public zsh (patches (search-patches "zsh-egrep-failing-test.patch")))) (build-system gnu-build-system) (arguments `(#:configure-flags - `("--with-tcsetpgrp" + `("CFLAGS=-g -O2 -Wno-error=incompatible-pointer-types" + "--with-tcsetpgrp" "--enable-pcre" "--enable-maildir-support" ;; share/zsh/site-functions isn't populated @@ -543,9 +543,7 @@ (define-public zsh (lambda _ (invoke "make" "info"))) (add-after 'build 'install-info (lambda _ (invoke "make" "install.info")))))) - (native-inputs (list autoconf - gcc-13 ;Using gcc-14, A01grammar.ztst hangs - texinfo)) + (native-inputs (list autoconf texinfo)) (inputs (list ncurses pcre perl)) (synopsis "Powerful shell for interactive use and scripting") (description "The Z shell (zsh) is a Unix shell that can be used