From 588068d5a12b752b70bb7e4f3f8decb1ce2fe4e8 Mon Sep 17 00:00:00 2001 From: fanquake Date: Sun, 27 Aug 2023 15:08:56 +0100 Subject: guix: remove GCC 10 workaround from NSIS Fixed upstream in 3.06, see https://github.com/kichik/nsis/commit/229b6136c41ba5caba25936f4927476d20aa283f. https://sourceforge.net/p/nsis/bugs/1248/ --- contrib/guix/manifest.scm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'contrib/guix/manifest.scm') diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm index 612a2526da..0101826399 100644 --- a/contrib/guix/manifest.scm +++ b/contrib/guix/manifest.scm @@ -142,10 +142,6 @@ chain for " target " development.")) (home-page (package-home-page pthreads-xgcc)) (license (package-license pthreads-xgcc))))) -(define (make-nsis-for-gcc-10 base-nsis) - (package-with-extra-patches base-nsis - (search-our-patches "nsis-gcc-10-memmove.patch"))) - ;; While LIEF is packaged in Guix, we maintain our own package, ;; to simplify building, and more easily apply updates. ;; Moreover, the Guix's package uses cmake, which caused build @@ -604,7 +600,7 @@ inspecting signatures in Mach-O binaries.") ;; Windows (list zip (make-mingw-pthreads-cross-toolchain "x86_64-w64-mingw32") - (make-nsis-for-gcc-10 nsis-x86_64) + nsis-x86_64 nss-certs osslsigncode)) ((string-contains target "-linux-") -- cgit v1.2.3