Merge master into stdenv-updates

Conflicts:
	pkgs/development/libraries/glibc/2.18/common.nix (take stdenv-updates)
	pkgs/misc/emulators/zsnes/default.nix (more complex, build tested)
	pkgs/top-level/all-packages.nix (auto-solved)

pkgs/misc/emulators/zsnes/default.nix

@@ -15,11 +15,29 @@ stdenv.mkDerivation {
     patch -p0 < ${./zsnes-1.51-libpng15.patch}
   '';
 
+  buildInputs = [ nasm SDL zlib libpng ncurses mesa ];
+
   preConfigure = ''
     cd src
-  '';
 
-  buildInputs = [ nasm SDL zlib libpng ncurses mesa ];
+    sed -i "/^STRIP/d" configure
+    
+    # Fix for undefined strncasecmp()
+    echo '#include <strings.h>' > tmp.cpp 
+    cat tmp.cpp tools/strutil.h > tools/strutil.h.new
+    mv tools/strutil.h.new tools/strutil.h
+    
+    # Fix for undefined system()
+    echo '#include <stdlib.h>' > tmp.cpp
+    cat tmp.cpp tools/depbuild.cpp > tools/depbuild.cpp.new
+    mv tools/depbuild.cpp.new tools/depbuild.cpp
+    
+    # Fix for lots of undefined strcmp, strncmp etc.
+    echo '#include <string.h>' > tmp.cpp 
+    cat tmp.cpp parsegen.cpp > parsegen.cpp.new
+    mv parsegen.cpp.new parsegen.cpp
+  '';
+  
 
   configureFlags = "--enable-release";
 
@@ -29,4 +47,4 @@ stdenv.mkDerivation {
     maintainers = [ stdenv.lib.maintainers.sander ];
     homepage = http://www.zsnes.com;
   };
-}
+}