diff options
author | Carl Dong <contact@carldong.me> | 2019-09-11 15:43:19 -0400 |
---|---|---|
committer | Carl Dong <contact@carldong.me> | 2019-10-11 11:44:44 -0400 |
commit | e214a22007450187c3db5d9fdef6ee021be6e953 (patch) | |
tree | 5808094fb50825c6f64ca87bfe65da07c85e7e6b /gnu/packages/patches | |
parent | 07bec45dd3a1c5fa05f7ebfdb60ddbcf098bd01f (diff) | |
download | guix-e214a22007450187c3db5d9fdef6ee021be6e953.tar guix-e214a22007450187c3db5d9fdef6ee021be6e953.tar.gz |
gnu: Add nsis-x86_64 and nsis-i686.
* guix/build-system/scons.scm (scons-build): Add build-targets and
install-targets parameters.
* guix/build/scons-build-system.scm (build, install): Adjust
accordingly.
* doc/guix.texi (Build Systems): Document it.
* gnu/packages/installers.scm: New file,
(make-nsis): New procedure,
(nsis-x86_64, nsis-i686): New variables.
* gnu/packages/patches/nsis-env-passthru.patch: New file.
* gnu/local.mk (dist_patch_DATA, GNU_SYSTEM_MODULES): Adjust
accordingly.
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r-- | gnu/packages/patches/nsis-env-passthru.patch | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/gnu/packages/patches/nsis-env-passthru.patch b/gnu/packages/patches/nsis-env-passthru.patch new file mode 100644 index 0000000000..36b4092230 --- /dev/null +++ b/gnu/packages/patches/nsis-env-passthru.patch @@ -0,0 +1,12 @@ +--- 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) + ++import os; ++defenv['ENV'] = os.environ ++ + Export('defenv') + + ###################################################################### |