From 21c203a53a617962586ef645b22f80814b05fd65 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Wed, 23 Jan 2013 23:21:59 +0100
Subject: packages: Mark the `arguments' field of <package> as thunked.

* guix/packages.scm (<package>): Mark `arguments' as thunked.
  (package-derivation): Adjust accordingly.  Parameterize
  %CURRENT-SYSTEM to SYSTEM, so that arguments can refer to it.

* guix/build-system/gnu.scm (package-with-explicit-inputs): Expect
  `package-arguments' to always return a list, and return a list.
  (package-with-extra-configure-variable): Likewise.
  (static-package): Likewise.
* gnu/packages/base.scm (patch, findutils, gcc-4.7, binutils-boot0,
  gcc-boot0, glibc-final-with-bootstrap-bash, cross-gcc-wrapper,
  static-bash-for-glibc, binutils-final, gcc-final): Change `arguments'
  from a lambda to a list, and use (%current-system) as needed.
  (nix-system->gnu-triplet, boot-triplet): Have the first argument
  default to (%current-system).
* gnu/packages/bootstrap.scm (glibc-dynamic-linker): Have `system'
  default to (%current-system).
  (%bootstrap-gcc): Change `arguments' to a list.
* gnu/packages/gawk.scm (gawk): Likewise.
* gnu/packages/m4.scm (m4): Likewise.
* gnu/packages/make-bootstrap.scm (%glibc-for-bootstrap): Likewise, and
  expect `package-arguments' to return a list.
  (%static-inputs, %gcc-static, tarball-package): Likewise.
* gnu/packages/ncurses.scm (ncurses): Likewise.
---
 guix/packages.scm | 40 +++++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 19 deletions(-)

(limited to 'guix/packages.scm')

diff --git a/guix/packages.scm b/guix/packages.scm
index a9534adfec..a76e51a5d0 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -110,7 +110,7 @@ representation."
   (source package-source)                 ; <origin> instance
   (build-system package-build-system)     ; build system
   (arguments package-arguments            ; arguments for the build method
-             (default '()))
+             (default '()) (thunked))
 
   (inputs package-inputs                  ; input packages or derivations
           (default '()))
@@ -290,24 +290,26 @@ PACKAGE for SYSTEM."
   ;; because some derivations, such as the implicit inputs of the GNU build
   ;; system, will be queried many, many times in a row.
   (cached package system
-          (match package
-            (($ <package> name version source (= build-system-builder builder)
-                args inputs propagated-inputs native-inputs self-native-input?
-                outputs)
-             ;; TODO: For `search-paths', add a builder prologue that calls
-             ;; `set-path-environment-variable'.
-             (let ((inputs (map expand-input
-                                (package-transitive-inputs package))))
-
-               (apply builder
-                      store (package-full-name package)
-                      (and source
-                           (package-source-derivation store source system))
-                      inputs
-                      #:outputs outputs #:system system
-                      (if (procedure? args)
-                          (args system)
-                          args)))))))
+
+          ;; Bind %CURRENT-SYSTEM so that thunked field values can refer
+          ;; to it.
+          (parameterize ((%current-system system))
+            (match package
+              (($ <package> name version source (= build-system-builder builder)
+                  args inputs propagated-inputs native-inputs self-native-input?
+                  outputs)
+               ;; TODO: For `search-paths', add a builder prologue that calls
+               ;; `set-path-environment-variable'.
+               (let ((inputs (map expand-input
+                                  (package-transitive-inputs package))))
+
+                 (apply builder
+                        store (package-full-name package)
+                        (and source
+                             (package-source-derivation store source system))
+                        inputs
+                        #:outputs outputs #:system system
+                        (args))))))))
 
 (define* (package-cross-derivation store package)
   ;; TODO
-- 
cgit v1.2.3