diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-06-29 23:23:59 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-06-29 23:23:59 +0200 |
| commit | 6e1f8d552b73e508bba47dedb5676ce5ccdcc398 (patch) | |
| tree | 952a8fa2652ad26946100707311824b8c7a88768 /guix/scripts/build.scm | |
| parent | c24b896365ebf0c783140e53e000305e682d18c5 (diff) | |
| parent | 8e92d5465fc154fed5d06f7e4a64d7dcccded74d (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'guix/scripts/build.scm')
| -rw-r--r-- | guix/scripts/build.scm | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm index 61ca4dca9f..ec58ba871b 100644 --- a/guix/scripts/build.scm +++ b/guix/scripts/build.scm @@ -836,11 +836,9 @@ build." (#t (match (package-source p) (#f - (format (current-error-port) - (G_ "~a: warning: \ -package '~a' has no source~%") - (location->string (package-location p)) - (package-name p)) + (warning (package-location p) + (G_ "package '~a' has no source~%") + (package-name p)) '()) (s (list (package-source-derivation store s))))) @@ -918,7 +916,8 @@ needed." '()))) (items (filter-map (match-lambda (('argument . (? store-path? file)) - file) + (and (not (derivation-path? file)) + file)) (_ #f)) opts)) (roots (filter-map (match-lambda |