Skip to content

Commit 588068d

Browse files
committed
guix: remove GCC 10 workaround from NSIS
Fixed upstream in 3.06, see kichik/nsis@229b613. https://sourceforge.net/p/nsis/bugs/1248/
1 parent ab42b2e commit 588068d

File tree

2 files changed

+1
-28
lines changed

2 files changed

+1
-28
lines changed

contrib/guix/manifest.scm

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -142,10 +142,6 @@ chain for " target " development."))
142142
(home-page (package-home-page pthreads-xgcc))
143143
(license (package-license pthreads-xgcc)))))
144144

145-
(define (make-nsis-for-gcc-10 base-nsis)
146-
(package-with-extra-patches base-nsis
147-
(search-our-patches "nsis-gcc-10-memmove.patch")))
148-
149145
;; While LIEF is packaged in Guix, we maintain our own package,
150146
;; to simplify building, and more easily apply updates.
151147
;; Moreover, the Guix's package uses cmake, which caused build
@@ -604,7 +600,7 @@ inspecting signatures in Mach-O binaries.")
604600
;; Windows
605601
(list zip
606602
(make-mingw-pthreads-cross-toolchain "x86_64-w64-mingw32")
607-
(make-nsis-for-gcc-10 nsis-x86_64)
603+
nsis-x86_64
608604
nss-certs
609605
osslsigncode))
610606
((string-contains target "-linux-")

contrib/guix/patches/nsis-gcc-10-memmove.patch

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)