nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: Fix `static-package' arguments overriding. 

* guix/build-system/gnu.scm (static-package): Call `package-arguments'
  from within the `arguments' field, so it see the
  right (%current-target-system).
This commit is contained in:
Ludovic Courtès 2013-06-05 16:39:58 +02:00
parent a1db097535
commit a3e69bb892
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
guix/build-system/gnu.scm
View File

@ -116,11 +116,10 @@ flags for VARIABLE, the associated value is augmented."
#:key (strip-all? #t)) #:key (strip-all? #t))
"Return a statically-linked version of package P. If STRIP-ALL? is true, "Return a statically-linked version of package P. If STRIP-ALL? is true,
use `--strip-all' as the arguments to `strip'." use `--strip-all' as the arguments to `strip'."
(let ((args (package-arguments p)))
(package (inherit p) (package (inherit p)
(location (source-properties->location loc)) (location (source-properties->location loc))
(arguments (arguments
(let ((a (default-keyword-arguments args (let ((a (default-keyword-arguments (package-arguments p)
'(#:configure-flags '() '(#:configure-flags '()
#:strip-flags '("--strip-debug"))))) #:strip-flags '("--strip-debug")))))
(substitute-keyword-arguments a (substitute-keyword-arguments a
@ -129,7 +128,7 @@ use `--strip-all' as the arguments to `strip'."
((#:strip-flags flags) ((#:strip-flags flags)
(if strip-all? (if strip-all?
''("--strip-all") ''("--strip-all")
flags)))))))) flags)))))))
(define %store (define %store