diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2024-01-31 13:31:14 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2024-01-31 13:34:23 -0500 |
| commit | 73939b9f3c9816af1705f7160c0128abdac72755 (patch) | |
| tree | 03bfed7acc553542a948c0a582cd393ab2c71efe /guix/build-system | |
| parent | c41121d604ac3cbbe0a24e94c0fbc3b599eb537b (diff) | |
| parent | 023c3e0ac44e7fc35eeebc87535a47df2cd01485 (diff) | |
Merge remote-tracking branch 'origin/master' into core-updates
Resolved conflicts in:
gnu/packages/astronomy.scm
gnu/packages/axoloti.scm
gnu/packages/games.scm
gnu/packages/guile-xyz.scm
gnu/packages/mail.scm
gnu/packages/photo.scm
gnu/packages/sphinx.scm
gnu/packages/tls.scm
gnu/packages/web-browsers.scm
Change-Id: I726fb6139d70ccead1b0f59afc72ccc523a1217d
Diffstat (limited to 'guix/build-system')
| -rw-r--r-- | guix/build-system/perl.scm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/guix/build-system/perl.scm b/guix/build-system/perl.scm index a8d954ea91..633c9166c7 100644 --- a/guix/build-system/perl.scm +++ b/guix/build-system/perl.scm @@ -133,7 +133,9 @@ provides a `Makefile.PL' file as its build system." search-paths)) #:make-maker? #$make-maker? #:make-maker-flags #$make-maker-flags - #:module-build-flags #$(sexp->gexp module-build-flags) + #:module-build-flags #$(if (pair? module-build-flags) + (sexp->gexp module-build-flags) + module-build-flags) #:phases #$(if (pair? phases) (sexp->gexp phases) phases) |