diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-06-11 23:06:06 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-06-11 23:33:32 +0200 |
| commit | 0004c5904c2e69a89005eac8b6322d18a8e9f611 (patch) | |
| tree | 11f626d46d7576cb29464791edf14b8a6a87df95 /guix | |
| parent | 8a16d064fa265c449d136ff6c3d3267e314cde8d (diff) | |
| download | gnu-guix-0004c5904c2e69a89005eac8b6322d18a8e9f611.tar gnu-guix-0004c5904c2e69a89005eac8b6322d18a8e9f611.tar.gz | |
packages: Make 'location' field innate.
* guix/packages.scm (<package>)[location]: Add 'innate' property.
* guix/build-system/gnu.scm (static-package): Remove 'loc' parameter and
'location' field.
* gnu/packages/autotools.scm (autoconf-wrapper): Remove 'location' field.
* gnu/packages/commencement.scm (gnu-make-boot0, diffutils-boot0, gcc-final):
Likewise.
* gnu/packages/cross-base.scm (cross): Likewise.
* gnu/packages/emacs.scm (emacs-no-x, emacs-no-x-toolkit): Likewise.
* gnu/packages/make-bootstrap.scm (tarball-package): Likewise.
* gnu/packages/maths.scm (petsc-complex): Likewise.
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/build-system/gnu.scm | 4 | ||||
| -rw-r--r-- | guix/packages.scm | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm index da664e5422..05b6e6f680 100644 --- a/guix/build-system/gnu.scm +++ b/guix/build-system/gnu.scm @@ -160,12 +160,10 @@ flags for VARIABLE, the associated value is augmented." "A version of P linked with `-static-gcc'." (package-with-extra-configure-variable p "LDFLAGS" "-static-libgcc")) -(define* (static-package p #:optional (loc (current-source-location)) - #:key (strip-all? #t)) +(define* (static-package p #:key (strip-all? #t)) "Return a statically-linked version of package P. If STRIP-ALL? is true, use `--strip-all' as the arguments to `strip'." (package (inherit p) - (location (source-properties->location loc)) (arguments (let ((a (default-keyword-arguments (package-arguments p) '(#:configure-flags '() diff --git a/guix/packages.scm b/guix/packages.scm index c955b35155..c900541e53 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -240,7 +240,8 @@ representation." (location package-location (default (and=> (current-source-location) - source-properties->location)))) + source-properties->location)) + (innate))) (set-record-type-printer! <package> (lambda (package port) |