diff options
| author | fanquake <fanquake@gmail.com> | 2021-12-08 09:16:52 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2022-01-05 10:32:24 +0800 |
| commit | b1e8f0b96edf87b0ee68e85ea50c62e459ed8cb8 (patch) | |
| tree | de588ac9e9494ffa3393cb8d57c6d4f5f584e258 /contrib/guix/manifest.scm | |
| parent | 3ccfba1c7f0515997b502103c515f9856d21c3c4 (diff) | |
| download | bitcoin-b1e8f0b96edf87b0ee68e85ea50c62e459ed8cb8.tar.xz | |
guix: use uptream nsis-x86_64
Our patch is now used upstream.
Diffstat (limited to 'contrib/guix/manifest.scm')
| -rw-r--r-- | contrib/guix/manifest.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm index d8c0fcbb74..9c396833c4 100644 --- a/contrib/guix/manifest.scm +++ b/contrib/guix/manifest.scm @@ -189,9 +189,9 @@ chain for " target " development.")) (home-page (package-home-page pthreads-xgcc)) (license (package-license pthreads-xgcc))))) -(define (make-nsis-with-sde-support base-nsis) +(define (make-nsis-for-gcc-10 base-nsis) (package-with-extra-patches base-nsis - (search-our-patches "nsis-SConstruct-sde-support.patch"))) + (search-our-patches "nsis-gcc-10-memmove.patch"))) (define-public lief (package @@ -630,7 +630,7 @@ inspecting signatures in Mach-O binaries.") ;; Windows (list zip (make-mingw-pthreads-cross-toolchain "x86_64-w64-mingw32") - (make-nsis-with-sde-support nsis-x86_64) + (make-nsis-for-gcc-10 nsis-x86_64) osslsigncode)) ((string-contains target "-linux-") (list (cond ((string-contains target "riscv64-") |