From 6606c464908b5f618351230fe27c8ea45620db91 Mon Sep 17 00:00:00 2001 From: Simon Tournier Date: Tue, 10 Sep 2024 03:27:12 +0200 Subject: [PATCH] gnu: smithforth: Move system.fs origin from phases to native-inputs. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/dlang.scm (smithforth)[arguments]: Move system.fs origin from here... [native-inputs]: ...to here. Change-Id: I82ff81f72dbe2ecf70fbbd44674596e1a62cadcf Signed-off-by: Ludovic Courtès --- gnu/packages/forth.scm | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/gnu/packages/forth.scm b/gnu/packages/forth.scm index 6e8d8cdc4cf84a1e22e04ab3a16bbc505e8b04ba..c5238878711247ec5a69d52fca979133993c951c 100644 --- a/gnu/packages/forth.scm +++ b/gnu/packages/forth.scm @@ -75,7 +75,15 @@ included.") (sha256 (base32 "0a39pv7529llsa3f48fmvwvlcp3f9v8qkn5ziw2l6kxf0qvli3lm")))) (build-system trivial-build-system) - (native-inputs (list xxd)) + (native-inputs (list xxd + (origin + (method url-fetch) + (uri (string-append + "https://dacvs.neocities.org/SF/system" + version "fs.txt")) + (sha256 + (base32 + "17v1pp64s6n8q8w3kg48nd7zdcx2208y4svr5fpfms5lkyzg7z1m"))))) (arguments (list #:modules '((guix build utils)) @@ -84,14 +92,8 @@ included.") (use-modules (guix build utils) (ice-9 textual-ports)) (let* ((sforth.dmp #$(package-source this-package)) - (system.fs #$(origin - (method url-fetch) - (uri (string-append - "https://dacvs.neocities.org/SF/system" - version "fs.txt")) - (sha256 - (base32 - "17v1pp64s6n8q8w3kg48nd7zdcx2208y4svr5fpfms5lkyzg7z1m")))) + (system.fs #$(this-package-native-input + (string-append "system" version "fs.txt"))) (xxd (string-append (assoc-ref %build-inputs "xxd") "/bin/xxd")) (bin (string-append (assoc-ref %outputs "out") "/bin")))