aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/patches/nsis-env-passthru.patch
diff options
context:
space:
mode:
authorVivien Kraus <vivien@planete-kraus.eu>2022-08-02 17:23:05 +0200
committer宋文武 <iyzsong@member.fsf.org>2022-08-03 14:23:00 +0800
commite2ad0b0f8b9cdea88211827b40a5b46aa4d9f062 (patch)
treedad4d2073a4532ddd1a4da1467078235bdfb5166 /gnu/packages/patches/nsis-env-passthru.patch
parentcb14d802aef0aaa475147e0a5cc36ff71e631a62 (diff)
downloadguix-e2ad0b0f8b9cdea88211827b40a5b46aa4d9f062.tar.gz
guix-e2ad0b0f8b9cdea88211827b40a5b46aa4d9f062.zip
gnu: nsis: Update to 3.08.
* gnu/packages/patches/nsis-source-date-epoch.patch: Drop this patch. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/patches/nsis-env-passthru.patch: Adjust the patch. * gnu/packages/installers.scm (make-nsis): Update to 3.08. Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
Diffstat (limited to 'gnu/packages/patches/nsis-env-passthru.patch')
-rw-r--r--gnu/packages/patches/nsis-env-passthru.patch17
1 files changed, 8 insertions, 9 deletions
diff --git a/gnu/packages/patches/nsis-env-passthru.patch b/gnu/packages/patches/nsis-env-passthru.patch
index 36b4092230..22b186f55a 100644
--- a/gnu/packages/patches/nsis-env-passthru.patch
+++ b/gnu/packages/patches/nsis-env-passthru.patch
@@ -1,12 +1,11 @@
---- nsis-3.04-src/SConstruct 2019-05-30 14:53:30.276775332 -0400
-+++ nsis-3.04-src/SConstruct 2019-05-30 14:54:17.901232914 -0400
-@@ -77,6 +77,9 @@
- if not toolset and not path:
- defenv = Environment(TARGET_ARCH = arch)
+--- nsis-3.08-src/SConstruct 2021-01-15 17:31:10.000000000 +0100
++++ nsis-3.08-src/SConstruct-passthru 2022-08-02 17:11:12.414702282 +0200
+@@ -71,7 +71,7 @@
-+import os;
-+defenv['ENV'] = os.environ
-+
- Export('defenv')
+ defenv = {
+ 'TARGET_ARCH': ARGUMENTS.get('TARGET_ARCH', 'x86'),
+- 'ENV': {}
++ 'ENV': os.environ.copy()
+ }
######################################################################