--- a/src/nsis-1-explicit-mingw-cross-prefix.patch	Sun Aug 12 12:16:42 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-This file is part of MXE.
-See index.html for further information.
-
-This patch has been taken from:
-http://sourceforge.net/tracker/index.php?func=detail&aid=3305366&group_id=22049&atid=373085
-
---- a/SCons/Tools/crossmingw.py
-+++ b/SCons/Tools/crossmingw.py
-@@ -61,6 +61,9 @@ prefixes = SCons.Util.Split("""
- """)
- 
- def find(env):
-+    if env.has_key('MINGW_CROSS_PREFIX'):
-+        return env['MINGW_CROSS_PREFIX']
-+
-     for prefix in prefixes:
-         # First search in the SCons path and then the OS path:
-         if env.WhereIs(prefix + 'gcc') or SCons.Util.WhereIs(prefix + 'gcc'):
-diff --git a/SConstruct b/SConstruct
-index 80872bc..4f113dd 100755
---- a/SConstruct
-+++ b/SConstruct
-@@ -59,6 +59,7 @@ doc = [
- 
- path = ARGUMENTS.get('PATH', '')
- toolset = ARGUMENTS.get('TOOLSET', '')
-+mingw_cross_prefix = ARGUMENTS.get('MINGW_CROSS_PREFIX', '')
- 
- if toolset and path:
- 	defenv = Environment(ENV = {'PATH' : path}, TOOLS = toolset.split(',') + ['zip'])
-@@ -69,6 +70,8 @@ else:
- 		defenv = Environment(TOOLS = toolset.split(',') + ['zip'])
- if not toolset and not path:
- 	defenv = Environment()
-+if mingw_cross_prefix:
-+	defenv['MINGW_CROSS_PREFIX'] = mingw_cross_prefix
- 
- Export('defenv')
- 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/nsis-1-fixes.patch	Sun Aug 12 12:47:22 2012 +0200
@@ -0,0 +1,71 @@
+This file is part of MXE.
+See index.html for further information.
+
+From 1cc3dd0dfd47bab82e06be916f9e57ef783406f9 Mon Sep 17 00:00:00 2001
+From: Mark Brand <mabrand@mabrand.nl>
+Date: Sun, 12 Aug 2012 12:33:26 +0200
+Subject: [PATCH 1/2] explicit mingw cross prefix
+
+This patch has been taken from:
+http://sourceforge.net/tracker/index.php?func=detail&aid=3305366&group_id=22049&atid=373085
+
+diff --git a/SCons/Tools/crossmingw.py b/SCons/Tools/crossmingw.py
+index d27e01c..fef9150 100755
+--- a/SCons/Tools/crossmingw.py
++++ b/SCons/Tools/crossmingw.py
+@@ -61,6 +61,9 @@ prefixes = SCons.Util.Split("""
+ """)
+ 
+ def find(env):
++    if env.has_key('MINGW_CROSS_PREFIX'):
++        return env['MINGW_CROSS_PREFIX']
++
+     for prefix in prefixes:
+         # First search in the SCons path and then the OS path:
+         if env.WhereIs(prefix + 'gcc') or SCons.Util.WhereIs(prefix + 'gcc'):
+diff --git a/SConstruct b/SConstruct
+index 80872bc..4f113dd 100755
+--- a/SConstruct
++++ b/SConstruct
+@@ -59,6 +59,7 @@ doc = [
+ 
+ path = ARGUMENTS.get('PATH', '')
+ toolset = ARGUMENTS.get('TOOLSET', '')
++mingw_cross_prefix = ARGUMENTS.get('MINGW_CROSS_PREFIX', '')
+ 
+ if toolset and path:
+ 	defenv = Environment(ENV = {'PATH' : path}, TOOLS = toolset.split(',') + ['zip'])
+@@ -69,6 +70,8 @@ else:
+ 		defenv = Environment(TOOLS = toolset.split(',') + ['zip'])
+ if not toolset and not path:
+ 	defenv = Environment()
++if mingw_cross_prefix:
++	defenv['MINGW_CROSS_PREFIX'] = mingw_cross_prefix
+ 
+ Export('defenv')
+ 
+-- 
+1.7.10.4
+
+
+From 7df0fa80a65279ee7d99da8ec6abdddff7e040b0 Mon Sep 17 00:00:00 2001
+From: freeman <free.man.uu@gmail.com>
+Date: Sun, 12 Aug 2012 12:36:39 +0200
+Subject: [PATCH 2/2] add missing header
+
+
+diff --git a/Source/util.h b/Source/util.h
+index 4259a6a..664923e 100755
+--- a/Source/util.h
++++ b/Source/util.h
+@@ -25,6 +25,7 @@
+ #ifndef _WIN32
+ #  include <iconv.h>
+ #  include <stdio.h>
++#  include <unistd.h>
+ #endif
+ 
+ 
+-- 
+1.7.10.4
+