From ca29d19bd250f97abe3afa3558d6b196697ab270 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 18 Feb 2026 17:54:10 +0900 Subject: [PATCH] Revert "gnu: jamvm: Fix build on powerpc64." This reverts commit 99c1e2c5400c2a58cb0ec17c8269da20b81a26fa. Pushed by mistake. --- gnu/packages/java-bootstrap.scm | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/gnu/packages/java-bootstrap.scm b/gnu/packages/java-bootstrap.scm index f04b1c70d7..7a6251611e 100644 --- a/gnu/packages/java-bootstrap.scm +++ b/gnu/packages/java-bootstrap.scm @@ -9,7 +9,6 @@ ;;; Copyright © 2019 Andrius Štikonas ;;; Copyright © 2020 Simon South ;;; Copyright © 2021 Guillaume Le Vaillant -;;; Copyright © 2026 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -589,8 +588,7 @@ machine."))) jamvm-1-bootstrap))))) (define jamvm - (package - (inherit jamvm-1-bootstrap) + (package (inherit jamvm-1-bootstrap) (version "2.0.0") (source (origin (method url-fetch) @@ -610,16 +608,14 @@ machine."))) (build-system gnu-build-system) (arguments (substitute-keyword-arguments (package-arguments jamvm-1-bootstrap) - ((#:modules modules %default-gnu-modules) - (append '((srfi srfi-1) - (srfi srfi-26)) - modules)) - ((#:configure-flags flags) - #~(cons (string-append "--with-classpath-install-dir=" - (assoc-ref %build-inputs "classpath")) - (remove (cut string-prefix? "--with-classpath-install-dir" <>) - #$flags))))) - (inputs (list classpath-devel ecj-javac-wrapper libffi zip zlib)))) + ((#:configure-flags _) + '(list (string-append "--with-classpath-install-dir=" + (assoc-ref %build-inputs "classpath")))))) + (inputs + `(("classpath" ,classpath-devel) + ("ecj-javac-wrapper" ,ecj-javac-wrapper) + ("zip" ,zip) + ("zlib" ,zlib))))) (define ecj-javac-wrapper-final (package (inherit ecj-javac-wrapper)