From f41ee23a2525df143b560c238d0e708a94456b01 Mon Sep 17 00:00:00 2001 From: Rutherther Date: Thu, 18 Sep 2025 11:25:12 +0200 Subject: [PATCH] fix: make sure the environment package gets grafted inputs --- modules/ruther/environment.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/modules/ruther/environment.scm b/modules/ruther/environment.scm index 8c9a03ba2a1445f9a5f48e9f588dc776c7695971..3044686a216e3b7994bfeb8e238c0a399a389728 100644 --- a/modules/ruther/environment.scm +++ b/modules/ruther/environment.scm @@ -16,6 +16,13 @@ make-guile-environment package->application-environment)) +(define (manifest->packages manifest) + "Return the list of packages in MANIFEST." + (filter-map (lambda (entry) + (let ((item (manifest-entry-item entry))) + (if (package? item) item #f))) + (manifest-entries manifest))) + ;; Makes a package that uses the given environment, and wraps the binaries in it. ;; TODO: replace the paths (only in text files!!! not in binaries...) in all extra-paths files, ;; so instead of symlinking some of the files might have to be just copied and substituted. @@ -38,7 +45,8 @@ (native-inputs (list file)) (inputs - (list bash)) + (cons* bash + (manifest->packages manifest))) (arguments (list #:modules (source-module-closure