From 9e974e8ef1c1997729037dc92b55232b4c7abc12 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Mon, 24 Oct 2022 03:25:25 +0200 Subject: Make sure that the generated source is self-contained. --- disfluid/maintainer/channel-code.scm | 37 ++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/disfluid/maintainer/channel-code.scm b/disfluid/maintainer/channel-code.scm index 4b8d4ac..36a66e8 100644 --- a/disfluid/maintainer/channel-code.scm +++ b/disfluid/maintainer/channel-code.scm @@ -65,24 +65,33 @@ (guix profiles) (guix scripts pack) (guix gexp) + (guix modules) ,@modules))))) (define (fix-source _) `(source - (directory-union + (computed-file "source-with-translations" - (list - (origin - (method git-fetch) - (uri (git-reference - (url "https://labo.planete-kraus.eu/disfluid.git") - (commit #$disfluid-commit))) - (sha256 (base32 #$disfluid-hash))) - (origin - (method git-fetch) - (uri (git-reference - (url "https://labo.planete-kraus.eu/disfluid.git") - (commit #$disfluid-translations-commit))) - (sha256 (base32 #$disfluid-translations-hash))))))) + (with-imported-modules + (source-module-closure '((guix build utils))) + #~(begin + (use-modules (guix build utils)) + (copy-recursively + (#$(string->symbol "ungexp") + (directory-union + "source-with-translations-linked" + (list + (origin + (method git-fetch) + (uri (git-reference + (url "https://labo.planete-kraus.eu/disfluid.git") + (commit #$disfluid-commit))) + (sha256 (base32 #$disfluid-hash))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://labo.planete-kraus.eu/disfluid.git") + (commit #$disfluid-translations-commit))) + (sha256 (base32 #$disfluid-translations-hash)))))))))))) (define (fix-arguments args) `(arguments (,kwasikwot -- cgit v1.2.3