me/guix
Archived
1
0
Fork 0
Code Activity

packages: Disambiguate 'modules' and 'imported-modules' in <origin>.

Browse source 
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.
This commit is contained in:
Ludovic Courtès 2016-06-16 14:31:52 +02:00
parent 3d1240aa25
commit a7db719f3d
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gnu/packages/engineering.scm
View file

@ -232,6 +232,7 @@ optimizer; and it can produce photorealistic and design review images.")
(modules '((guix build utils) (modules '((guix build utils)
(guix build download) (guix build download)
(guix ftp-client))) (guix ftp-client)))
(imported-modules modules)
(patches (search-patches "fastcap-mulSetup.patch" (patches (search-patches "fastcap-mulSetup.patch"
"fastcap-mulGlobal.patch")))) "fastcap-mulGlobal.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)

5
guix/packages.scm
View file

@ -544,7 +544,8 @@ IMPORTED-MODULES specify modules to use/import for use by SNIPPET."
"--files-from=.file_list"))))))))) "--files-from=.file_list")))))))))
(let ((name (tarxz-name original-file-name)) (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 (gexp->derivation name build
#:graft? #f #:graft? #f
#:system system #:system system
@ -1152,7 +1153,7 @@ cross-compilation target triplet."
#:flags flags #:flags flags
#:system system #:system system
#:modules modules #:modules modules
#:imported-modules modules #:imported-modules imported-modules
#:guile-for-build guile))))) #:guile-for-build guile)))))
(define-gexp-compiler (origin-compiler (origin origin?) system target) (define-gexp-compiler (origin-compiler (origin origin?) system target)