From patchwork Wed Apr 26 17:33:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Aleksandr Vityazev X-Patchwork-Id: 49548 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 3410627BBE2; Wed, 26 Apr 2023 18:34:48 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.2 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,RCVD_IN_SORBS_WEB,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 040B427BBE9 for ; Wed, 26 Apr 2023 18:34:46 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1prj1w-0007C4-4l; Wed, 26 Apr 2023 13:34:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1prj1o-00078d-3y for guix-patches@gnu.org; Wed, 26 Apr 2023 13:34:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1prj1n-0001nB-LQ for guix-patches@gnu.org; Wed, 26 Apr 2023 13:34:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1prj1n-0002Z7-IF for guix-patches@gnu.org; Wed, 26 Apr 2023 13:34:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63094] [PATCH] gnu: maven-embedder: Fix build. References: <87h6t2eeke.fsf@posteo.org> In-Reply-To: <87h6t2eeke.fsf@posteo.org> Resent-From: Aleksandr Vityazev Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 26 Apr 2023 17:34:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63094 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63094@debbugs.gnu.org Received: via spool by 63094-submit@debbugs.gnu.org id=B63094.16825304429846 (code B ref 63094); Wed, 26 Apr 2023 17:34:03 +0000 Received: (at 63094) by debbugs.gnu.org; 26 Apr 2023 17:34:02 +0000 Received: from localhost ([127.0.0.1]:56932 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1prj1m-0002Yd-5U for submit@debbugs.gnu.org; Wed, 26 Apr 2023 13:34:02 -0400 Received: from mail-ed1-f54.google.com ([209.85.208.54]:47345) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1prj1k-0002YB-0r for 63094@debbugs.gnu.org; Wed, 26 Apr 2023 13:34:00 -0400 Received: by mail-ed1-f54.google.com with SMTP id 4fb4d7f45d1cf-5051abd03a7so11006003a12.2 for <63094@debbugs.gnu.org>; Wed, 26 Apr 2023 10:33:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682530434; x=1685122434; h=content-transfer-encoding:mime-version:user-agent:message-id:date :subject:to:from:from:to:cc:subject:date:message-id:reply-to; bh=m28OoT6ipytPJC+7LFSkao0q9Fg/qpJGdeLRr8cjWRY=; b=DQLf+Jty3Rhs+sL8VM5cOAQGtt4TRyQizMQkJOhJ8H+56uUB4fVve6ksXUWyJVIJGJ zhgSOYrtpBIghrVEDu1wrucKzFTsdeJb3TpTuuv1fDRPHeu4drCHFNQhNmUaw5sNvP+t 6AejJvNhGOaMM0EH4T/X+uEIWuAgKM+xIQQ3sv5bq+ehPa08xeydHHB/BSV7DYsLAwDM rVoLZVubPgF9PKDGu/EwsuK7unoyUuXKReR6GX/9mK9F5b8jZaqfcu0y/gJo6HuViNdL mrnLsLEXOLNSkhESW7IpWkjoGFjuftJ6L5PQ8RDQpki93OTiZGwJEmjnV/SdUkgoQG8v nExg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682530434; x=1685122434; h=content-transfer-encoding:mime-version:user-agent:message-id:date :subject:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=m28OoT6ipytPJC+7LFSkao0q9Fg/qpJGdeLRr8cjWRY=; b=RIuSW6e1mwEAFmQ8vhHrekHgshg/UTS0YgC/VH+k2/uHyGw6HcruIdJjjDh8Of/25q 9csxJ4YwMyRNOvYi5gZds2EsLnxOfYueyBINEbqcba1pyK1xgeNOuwrg4P1i7KMcbqW3 hzotXsJoFO/Gi8rGC1Y6z2iuFBGsmTJl+l4uzEs4LGpTAlPEb4aTkO3w31OX/icvbPEv hhNvzWQLnEAgh0IFibhtqOUYHy8jzaBZXErZ3c/I0mM3NdY22qBOwNldnHZieYMu3jAx pIMDaYwL8vvsNUUa349RZEWy6IIDlKyl/Du4dAW4T0NtjD/U7QVEwtQiJOTGg5pMYlZb lwrA== X-Gm-Message-State: AAQBX9f50XticNnyPDbD+pEyVfnhEsP6VpWnSM286MEObLhEuqORixD1 pF3c0fBJnuSYMb/eCtft8MonOK5wiRA= X-Google-Smtp-Source: AKy350b2piJjnfZyFxI27bI+5Vdl6Nev6eScz/wuBKOSOfZuCTtjNhUYZe4WMUxh0Swi1uN3UfQ+Rg== X-Received: by 2002:a05:6402:78b:b0:504:b30a:2298 with SMTP id d11-20020a056402078b00b00504b30a2298mr18745693edy.42.1682530434095; Wed, 26 Apr 2023 10:33:54 -0700 (PDT) Received: from magi (host-47-152-66-217.spbmts.ru. [217.66.152.47]) by smtp.gmail.com with ESMTPSA id o23-20020a170906769700b0094e9f87c6d4sm8326054ejm.192.2023.04.26.10.33.53 for <63094@debbugs.gnu.org> (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 26 Apr 2023 10:33:53 -0700 (PDT) From: Aleksandr Vityazev Date: Wed, 26 Apr 2023 20:33:52 +0300 Message-ID: <87a5yueef3.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maven (maven-embedder)[arguments]: Add the'add-sisu-shebang phase after unpack. --- gnu/packages/maven.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 6c2958fa11..a805bda8e5 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2019 Björn Höfling ;;; Copyright © 2020 Efraim Flashner ;;; Copyright © 2022 Artyom V. Poptsov +;;; Copyright © 2023 Aleksandr Vityazev ;;; ;;; This file is part of GNU Guix. ;;; @@ -1838,6 +1839,10 @@ (define-public maven-embedder #:jdk ,icedtea-8 #:phases (modify-phases %standard-phases + (add-after 'unpack 'add-sisu-shebang + (lambda _ + (substitute* "sisu.sh" + (("^## T") "#!/bin/sh\n## T")))) (add-before 'build 'generate-sisu-named (lambda _ (mkdir-p "build/classes/META-INF/sisu")