diff options
author | Marius Bakke <marius@gnu.org> | 2022-11-03 20:45:32 +0100 |
---|---|---|
committer | Marius Bakke <marius@gnu.org> | 2022-11-11 18:09:58 +0100 |
commit | a6343af22161b21ddbc4143a2b6a60d1ee860eb0 (patch) | |
tree | 237b48c29ae3b894a617054ffd3c01678fbfc8eb | |
parent | fa9ad4b4822d367e97ead5bfc221fa164083fe56 (diff) | |
download | guix-a6343af22161b21ddbc4143a2b6a60d1ee860eb0.tar.gz guix-a6343af22161b21ddbc4143a2b6a60d1ee860eb0.zip |
build-system/ant: Avoid usage of (guix build syscalls).
* guix/build/ant-build-system.scm (strip-jar-timestamps): Use MKDTEMP from
Guile core rather than MKDTEMP!.
* guix/build/java-utils.scm (install-jar-file-with-pom): Likewise.
-rw-r--r-- | guix/build/ant-build-system.scm | 3 | ||||
-rw-r--r-- | guix/build/java-utils.scm | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/guix/build/ant-build-system.scm b/guix/build/ant-build-system.scm index fae1b47ec5..d29912bf59 100644 --- a/guix/build/ant-build-system.scm +++ b/guix/build/ant-build-system.scm @@ -19,7 +19,6 @@ (define-module (guix build ant-build-system) #:use-module ((guix build gnu-build-system) #:prefix gnu:) - #:use-module (guix build syscalls) #:use-module (guix build utils) #:use-module (sxml simple) #:use-module (ice-9 match) @@ -201,7 +200,7 @@ dependencies of this jar file." repack them. This is necessary to ensure that archives are reproducible." (define (repack-archive jar) (format #t "repacking ~a\n" jar) - (let* ((dir (mkdtemp! "jar-contents.XXXXXX")) + (let* ((dir (mkdtemp "jar-contents.XXXXXX")) (manifest (string-append dir "/META-INF/MANIFEST.MF"))) (with-directory-excursion dir (invoke "jar" "xf" jar)) diff --git a/guix/build/java-utils.scm b/guix/build/java-utils.scm index 87c3ac43c9..6025c81667 100644 --- a/guix/build/java-utils.scm +++ b/guix/build/java-utils.scm @@ -21,7 +21,6 @@ (define-module (guix build java-utils) #:use-module (guix build utils) - #:use-module (guix build syscalls) #:use-module (guix build maven pom) #:use-module (guix build maven plugin) #:use-module (ice-9 match) @@ -83,7 +82,7 @@ fetched." "Unpack the jar archive, add the pom file, and repack it. This is necessary to ensure that maven can find dependencies." (format #t "adding ~a to ~a\n" pom-file jar) - (let* ((dir (mkdtemp! "jar-contents.XXXXXX")) + (let* ((dir (mkdtemp "jar-contents.XXXXXX")) (manifest (string-append dir "/META-INF/MANIFEST.MF")) (pom (get-pom pom-file)) (artifact (pom-artifactid pom)) |