Merge branch 'master' into hardened-stdenv

pkgs/misc/emulators/fceux/default.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchurl, scons, zlib, SDL, lua5, pkgconfig}:
+{stdenv, fetchurl, scons, zlib, SDL, lua5_1, pkgconfig}:
 
 stdenv.mkDerivation {
   name = "fceux-2.2.2";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [
-    scons zlib SDL lua5 pkgconfig
+    scons zlib SDL lua5_1 pkgconfig
   ];
 
   phases = "unpackPhase buildPhase";
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
     export CC="gcc"
     export CXX="g++"
     mkdir -p "$out" "$out/share/applications" "$out/share/pixmaps"
-    scons --prefix="$out" OPENGL=false GTK=false CREATE_AVI=false LOGO=false SYSTEM_LUA=false install
+    scons --prefix="$out" OPENGL=false GTK=false CREATE_AVI=false LOGO=false install
   '';
 
   meta = {

pkgs/misc/emulators/mupen64plus/1.5.nix

@@ -1,33 +0,0 @@
-{stdenv, fetchurl, which, pkgconfig, SDL, gtk, mesa, SDL_ttf}:
-
-stdenv.mkDerivation {
-  name = "mupen64plus-1.5";
-  src = fetchurl {
-    url = http://mupen64plus.googlecode.com/files/Mupen64Plus-1-5-src.tar.gz;
-    sha256 = "0gygfgyr2sg4yx77ijk133d1ra0v1yxi4xjxrg6kp3zdjmhdmcjq";
-  };
-  
-  buildInputs = [ which pkgconfig SDL gtk mesa SDL_ttf ];
-  
-  preConfigure = ''
-    # Some C++ incompatibility fixes
-    sed -i -e 's|char \* extstr = strstr|const char * extstr = strstr|' glide64/Main.cpp
-    sed -i -e 's|char \* extstr = strstr|const char * extstr = strstr|' glide64/Combine.cpp
-
-    # Fix some hardcoded paths
-    sed -i -e "s|/usr/local|$out|g" main/main.c
-
-    # Remove PATH environment variable from install script
-    sed -i -e "s|export PATH=|#export PATH=|" ./install.sh
-  '';
-  
-  buildPhase = "make all";
-  installPhase = "PREFIX=$out make install";
-  
-  meta = {
-    description = "A Nintendo 64 Emulator";
-    license = stdenv.lib.licenses.gpl2Plus;
-    homepage = http://code.google.com/p/mupen64plus;
-    maintainers = [ stdenv.lib.maintainers.sander ];
-  };
-}

pkgs/misc/emulators/wine/sources.nix

@@ -30,15 +30,15 @@ in rec {
   };
 
   unstable = fetchurl rec {
-    version = "1.9.2";
+    version = "1.9.3";
     url = "mirror://sourceforge/wine/wine-${version}.tar.bz2";
-    sha256 = "0yjf0i2yc0yj366kg6b2ci9bwz3jq5k5vl01bqw4lbpgf5m4sk9k";
+    sha256 = "0389xbs943iwdgv3a6pvcy2gxrwqzf20vrsbpd2yrj1lan2m8ps7";
     inherit (stable) gecko32 gecko64 mono;
   };
 
   staging = fetchFromGitHub rec {
     inherit (unstable) version;
-    sha256 = "05lxhl9rv936xh8v640l36xswszwc41iwpbjq7n5cwk361mdh1lp";
+    sha256 = "0r932caxlkdw36f36f8y4h2r3anpl61fmqr9payb83fj55gsiq4d";
     owner = "wine-compholio";
     repo = "wine-staging";
     rev = "v${version}";