diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-02-08 09:41:45 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-02-08 09:41:45 -0500 |
| commit | d88cee1d44a475b6ea276e87a4c98682255b881e (patch) | |
| tree | f2e681b5211840d4eef688120041c2dd730002cc /gnu/packages/nettle.scm | |
| parent | d2b9b4b861b71d11eaeaa12fe544c9ffb0b6644d (diff) | |
| parent | 20059f92a97726b40d4d74e67463a64c98d1da0d (diff) | |
| download | guix-d88cee1d44a475b6ea276e87a4c98682255b881e.tar.gz | |
Merge branch 'master' into staging.
With conflicts resolved in: gnu/packages/version-control.scm
Diffstat (limited to 'gnu/packages/nettle.scm')
| -rw-r--r-- | gnu/packages/nettle.scm | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/gnu/packages/nettle.scm b/gnu/packages/nettle.scm index 27bd9efc60..ea26ba3b2d 100644 --- a/gnu/packages/nettle.scm +++ b/gnu/packages/nettle.scm @@ -44,7 +44,7 @@ (arguments ;; 'sexp-conv' and other programs need to have their RUNPATH point to ;; $libdir, which is not the case by default. Work around it. - '(#:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath=" + `(#:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath=" (assoc-ref %outputs "out") "/lib")) #:phases (modify-phases %standard-phases @@ -59,7 +59,13 @@ (rename-file ar (string-append slib "/" (basename ar)))) - (find-files "." "\\.a$"))) + (find-files + "." + ,(if (target-mingw?) + '(lambda (filename _) + (and (string-suffix? ".a" filename) + (not (string-suffix? ".dll.a" filename)))) + "\\.a$")))) #t)))))) (outputs '("out" "debug" "static")) (native-inputs (list m4)) |