|
25 | 25 | (guix profiles) |
26 | 26 | (guix utils)) |
27 | 27 |
|
| 28 | +(define-syntax-rule (search-our-patches file-name ...) |
| 29 | + "Return the list of absolute file names corresponding to each |
| 30 | +FILE-NAME found in ./patches relative to the current file." |
| 31 | + (parameterize |
| 32 | + ((%patch-path (list (string-append (dirname (current-filename)) "/patches")))) |
| 33 | + (list (search-patch file-name) ...))) |
| 34 | + |
28 | 35 | (define (make-ssp-fixed-gcc xgcc) |
29 | 36 | "Given a XGCC package, return a modified package that uses the SSP function |
30 | 37 | from glibc instead of from libssp.so. Our `symbol-check' script will complain if |
@@ -150,6 +157,10 @@ chain for " target " development.")) |
150 | 157 | (home-page (package-home-page pthreads-xgcc)) |
151 | 158 | (license (package-license pthreads-xgcc))))) |
152 | 159 |
|
| 160 | +(define (make-nsis-with-sde-support base-nsis) |
| 161 | + (package-with-extra-patches base-nsis |
| 162 | + (search-our-patches "nsis-SConstruct-sde-support.patch"))) |
| 163 | + |
153 | 164 |
|
154 | 165 | (packages->manifest |
155 | 166 | (append |
@@ -189,7 +200,9 @@ chain for " target " development.")) |
189 | 200 | (let ((target (getenv "HOST"))) |
190 | 201 | (cond ((string-suffix? "-mingw32" target) |
191 | 202 | ;; Windows |
192 | | - (list zip (make-mingw-pthreads-cross-toolchain "x86_64-w64-mingw32") nsis-x86_64)) |
| 203 | + (list zip |
| 204 | + (make-mingw-pthreads-cross-toolchain "x86_64-w64-mingw32") |
| 205 | + (make-nsis-with-sde-support nsis-x86_64))) |
193 | 206 | ((string-contains target "riscv64-linux-") |
194 | 207 | (list (make-bitcoin-cross-toolchain "riscv64-linux-gnu" |
195 | 208 | #:base-gcc-for-libc gcc-7))) |
|
0 commit comments