From patchwork Thu Apr 8 17:49:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 28389 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B617327BC6E; Thu, 8 Apr 2021 18:52:07 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7431B27BC6F for ; Thu, 8 Apr 2021 18:52:03 +0100 (BST) Received: from localhost ([::1]:35534 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lUYp0-0005Ty-L5 for patchwork@mira.cbaines.net; Thu, 08 Apr 2021 13:52:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39784) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUYo7-00052z-An for guix-patches@gnu.org; Thu, 08 Apr 2021 13:51:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36656) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lUYo3-0004Ki-3v for guix-patches@gnu.org; Thu, 08 Apr 2021 13:51:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lUYo3-0003iW-2z for guix-patches@gnu.org; Thu, 08 Apr 2021 13:51:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47661] [PATCH 03/33] gnu: emacs: Patch more program file names. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 08 Apr 2021 17:51:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47661 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47661@debbugs.gnu.org Received: via spool by 47661-submit@debbugs.gnu.org id=B47661.161790424014092 (code B ref 47661); Thu, 08 Apr 2021 17:51:03 +0000 Received: (at 47661) by debbugs.gnu.org; 8 Apr 2021 17:50:40 +0000 Received: from localhost ([127.0.0.1]:48166 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYng-0003fE-9E for submit@debbugs.gnu.org; Thu, 08 Apr 2021 13:50:40 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:14142) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYne-0003eq-1v for 47661@debbugs.gnu.org; Thu, 08 Apr 2021 13:50:38 -0400 Received: from localhost.localdomain (194-96-13-79.adsl.highway.telekom.at [194.96.13.79]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FGTLz4gW9z1LWny for <47661@debbugs.gnu.org>; Thu, 8 Apr 2021 19:50:35 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FGTLz4gW9z1LWny DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1617904235; bh=Maz4zMth+hA493F08i2obhl+erojL0oiSNpPiQ2/BHo=; h=From:To:Subject:Date:In-Reply-To:References:From; b=ITFiJ/JEgK9XMueAU0R6a1ar5gYJtQr8lOtkO7Nf1fzJwvz2SUNkdmK1esfZfzsfY jA5x2lWRR67jyk9z0nB2TflPM0apLxXkdGDzCAWUYP6kWByrHWS9HHLvNvuXkpQ3oi WTTbUY64epRj8FNDklv5UOxA8NY4h7WaaoE+Uq54= From: Leo Prikler Date: Thu, 8 Apr 2021 19:49:37 +0200 Message-Id: <20210408175007.13360-3-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210408175007.13360-1-leo.prikler@student.tugraz.at> References: <20210408175007.13360-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs.scm (patch-program-file-names): Patch "ls", "sh" and "gzip". --- gnu/packages/emacs.scm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index e1b01ac22b..93db9fa242 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -136,6 +136,15 @@ "lisp/progmodes/sh-script.el") (("\"/bin/sh\"") (format #f "~s" (which "sh")))) + (substitute* "lisp/files.el" + (("\\(purecopy \"ls\"\\)") + (format #f "(purecopy ~s)" (which "ls")))) + (substitute* '("src/filelock.c" + "lisp/dired-aux.el" + "lisp/jka-compr.el" + "lisp/jka-cmpr-hook.el") + (("\"(sh\|gzip)\"" all cmd) + (format #f "~s" (which cmd)))) #t)) (add-before 'configure 'fix-/bin/pwd (lambda _ @@ -231,6 +240,10 @@ `(("gnutls" ,gnutls) ("ncurses" ,ncurses) + ;; Required for "core" functionality, such as dired and compression. + ("coreutils" ,coreutils) + ("gzip" ,gzip) + ;; Avoid Emacs's limited movemail substitute that retrieves POP3 email ;; only via insecure channels. This is not needed for (modern) IMAP. ("mailutils" ,mailutils) @@ -361,7 +374,9 @@ also enabled and works without glitches even on X server.")))) (delete 'strip-double-wrap))))) (inputs `(("guix-emacs.el" ,(search-auxiliary-file "emacs/guix-emacs.el")) - ("ncurses" ,ncurses))) + ("ncurses" ,ncurses) + ("coreutils" ,coreutils) + ("gzip" ,gzip))) (native-inputs `(("pkg-config" ,pkg-config)))))