diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-06-16 14:31:52 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-06-16 14:31:52 +0200 |
| commit | a7db719f3dc16b6be7aaab45e718798902d82833 (patch) | |
| tree | a74f4406c4e502b79f7bfd42ff073c80ea08189d | |
| parent | 3d1240aa2561792895795315c7783a28bf4412af (diff) | |
| download | gnu-guix-a7db719f3dc16b6be7aaab45e718798902d82833.tar gnu-guix-a7db719f3dc16b6be7aaab45e718798902d82833.tar.gz | |
packages: Disambiguate 'modules' and 'imported-modules' in <origin>.
The two mistakes made here (confusion between 'modules' and
'imported-modules') were canceling each other.
* guix/packages.scm (patch-and-repack): Use IMPORTED-MODULES, not
MODULES, as the base of the module list passed as #:modules to
'gexp->derivation'.
(origin->derivation): Pass IMPORTED-MODULES, not MODULES, as
the #:imported-modules argument of 'patch-and-repack'.
* gnu/packages/engineering.scm (fastcap)[source]: Add 'imported-modules'
field.
| -rw-r--r-- | gnu/packages/engineering.scm | 1 | ||||
| -rw-r--r-- | guix/packages.scm | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 02b1c4e9eb..7b21c11ad3 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -232,6 +232,7 @@ optimizer; and it can produce photorealistic and design review images.") (modules '((guix build utils) (guix build download) (guix ftp-client))) + (imported-modules modules) (patches (search-patches "fastcap-mulSetup.patch" "fastcap-mulGlobal.patch")))) (build-system gnu-build-system) diff --git a/guix/packages.scm b/guix/packages.scm index 05a632cf05..acb8f34417 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -544,7 +544,8 @@ IMPORTED-MODULES specify modules to use/import for use by SNIPPET." "--files-from=.file_list"))))))))) (let ((name (tarxz-name original-file-name)) - (modules (delete-duplicates (cons '(guix build utils) modules)))) + (modules (delete-duplicates (cons '(guix build utils) + imported-modules)))) (gexp->derivation name build #:graft? #f #:system system @@ -1152,7 +1153,7 @@ cross-compilation target triplet." #:flags flags #:system system #:modules modules - #:imported-modules modules + #:imported-modules imported-modules #:guile-for-build guile))))) (define-gexp-compiler (origin-compiler (origin origin?) system target) |