diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-03-27 00:12:15 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-03-27 00:12:15 +0100 |
| commit | 18af6870370226b4d502d7372844e7f2aded5887 (patch) | |
| tree | 749d93209bd0cb9710ccaae2207df670f37eaa36 /guix/packages.scm | |
| parent | 0ab8ad46322bea331ed5f5592843ba35e7f38b37 (diff) | |
| parent | 3089b70d766bd9ec70e1464867130b7b864fbe17 (diff) | |
| download | guix-patches-18af6870370226b4d502d7372844e7f2aded5887.tar guix-patches-18af6870370226b4d502d7372844e7f2aded5887.tar.gz | |
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/icu4c.scm
gnu/packages/man.scm
gnu/packages/python-xyz.scm
guix/scripts/environment.scm
guix/scripts/pack.scm
guix/scripts/package.scm
guix/scripts/pull.scm
guix/store.scm
Diffstat (limited to 'guix/packages.scm')
| -rw-r--r-- | guix/packages.scm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/guix/packages.scm b/guix/packages.scm index 1ae16b60d1..ef96b5692f 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -363,12 +363,12 @@ object." (let ((field (assoc field inits))) (match field ((_ value) - (let ((props (source-properties value))) - (and props + (let ((loc (and=> (source-properties value) + source-properties->location))) + (and loc ;; Preserve the original file name, which may be a ;; relative file name. - (let ((loc (source-properties->location props))) - (set-field loc (location-file) file))))) + (set-field loc (location-file) file)))) (_ #f)))) (_ |