Merge branch 'staging' into closure-size

9 files changed, 24 insertions, 82 deletions

diff --git a/pkgs/misc/emulators/VisualBoyAdvance/default.nix b/pkgs/misc/emulators/VisualBoyAdvance/default.nix
deleted file mode 100644
index 015c61e461e6..000000000000
--- a/pkgs/misc/emulators/VisualBoyAdvance/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{stdenv, fetchurl, zlib, libpng, SDL, nasm}:
-
-stdenv.mkDerivation {
-  name = "VisualBoyAdvance-1.7.2";
-  src = fetchurl {
-    url = mirror://sourceforge/vba/VisualBoyAdvance-src-1.7.2.tar.gz;
-    sha256 = "1dr9w5i296dyq2gbx7sijk6p375aqnwld2n6rwnbzm2g3a94y4gl";
-  };
-  patches = [ ./libpng15.patch ./fix.diff ]; # patch to shut up lost of precision errors
-  preConfigure = ''
-    # Fix errors with invalid conversion from 'const char*' to 'char*'
-    sed -i -e "s|char \* p = strrchr|const char * p = strrchr|g" src/GBA.cpp
-    sed -i -e "s|char \* p = strrchr|const char * p = strrchr|g" src/Util.cpp
-  '';
-  buildInputs = [ zlib libpng SDL ] ++ stdenv.lib.optional (stdenv.system == "i686-linux") nasm;
-
-  meta = {
-    description = "A Game Boy/Game Boy Color/Game Boy Advance Emulator";
-    license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = [ stdenv.lib.maintainers.sander ];
-    homepage = http://vba.ngemu.com;
-    broken = true;
-  };
-}
diff --git a/pkgs/misc/emulators/VisualBoyAdvance/fix.diff b/pkgs/misc/emulators/VisualBoyAdvance/fix.diff
deleted file mode 100644
index 646db9c45e66..000000000000
--- a/pkgs/misc/emulators/VisualBoyAdvance/fix.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -urN ../tmp-orig/visualboyadvance-1.7.2/src/sdl/debugger.cpp 
-./src/sdl/debugger.cpp
---- ../tmp-orig/visualboyadvance-1.7.2/src/sdl/debugger.cpp     2004-05-13 
-16:13:14.000000000 +0200
-+++ ./src/sdl/debugger.cpp      2005-03-21 21:57:06.000000000 +0100
-@@ -950,9 +950,9 @@
- {
-   u32 address = 0;
-   if(mem >= (u32*)&workRAM[0] && mem <= (u32*)&workRAM[0x3ffff])
--    address = 0x2000000 + ((u32)mem - (u32)&workRAM[0]);
-+    address = 0x2000000 + ((unsigned long)mem - (unsigned long)&workRAM[0]);
-   else
--    address = 0x3000000 + ((u32)mem - (u32)&internalRAM[0]);
-+    address = 0x3000000 + ((unsigned long)mem - (unsigned long)&internalRAM[0]);
- 
-   if(size == 2)
-     printf("Breakpoint (on write) address %08x old:%08x new:%08x\n", 
-diff -urN ../tmp-orig/visualboyadvance-1.7.2/src/prof/prof.cpp 
-./src/prof/prof.cpp
---- ../tmp-orig/visualboyadvance-1.7.2/src/prof/prof.cpp        2004-05-13 
-16:31:58.000000000 +0200
-+++ ./src/prof/prof.cpp 2005-03-21 21:56:27.000000000 +0100
-@@ -266,7 +266,7 @@
-     for (toindex=froms[fromindex]; toindex!=0; toindex=tos[toindex].link) {
-       if(profWrite8(fd, GMON_TAG_CG_ARC) ||
-          profWrite32(fd, (u32)frompc) ||
--         profWrite32(fd, (u32)tos[toindex].selfpc) ||
-+         profWrite32(fd, (unsigned long)tos[toindex].selfpc) ||
-          profWrite32(fd, tos[toindex].count)) {
-         systemMessage(0, "mcount: arc");
-         fclose(fd);
diff --git a/pkgs/misc/emulators/VisualBoyAdvance/libpng15.patch b/pkgs/misc/emulators/VisualBoyAdvance/libpng15.patch
deleted file mode 100644
index b6f8872ce2bb..000000000000
--- a/pkgs/misc/emulators/VisualBoyAdvance/libpng15.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-From Gentoo. Fixes compilation with libpng-1.5
-
---- a/src/Util.cpp
-+++ b/src/Util.cpp
-@@ -79,7 +79,7 @@
-     return false;
-   }
- 
--  if(setjmp(png_ptr->jmpbuf)) {
-+  if(setjmp(png_jmpbuf(png_ptr))) {
-     png_destroy_write_struct(&png_ptr,NULL);
-     fclose(fp);
-     return false;
diff --git a/pkgs/misc/emulators/vice/default.nix b/pkgs/misc/emulators/vice/default.nix
index b869143ff1cc..143c23ee86c4 100644
--- a/pkgs/misc/emulators/vice/default.nix
+++ b/pkgs/misc/emulators/vice/default.nix
@@ -1,17 +1,19 @@
-{ stdenv, fetchurl, perl, gettext, libpng, giflib, libjpeg, alsaLib, readline, mesa, libX11
-, pkgconfig, gtk, SDL, autoconf, automake, makeDesktopItem
+{ stdenv, fetchurl, perl, libpng, giflib, libjpeg, alsaLib, readline, mesa, libX11
+, pkgconfig, gtk, SDL, autoreconfHook, makeDesktopItem
 }:
 
 stdenv.mkDerivation rec {
   name = "vice-2.2";
+
   src = fetchurl {
     url = http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.2.tar.gz;
     sha256 = "0l8mp9ybx494fdqgr1ps4x3c3qzms4yyg4hzcn3ihzy92zw1nn2x";
   };
-  buildInputs = [ perl gettext libpng giflib libjpeg alsaLib readline mesa
-                  pkgconfig gtk SDL autoconf automake ];
+
+  buildInputs = [ perl libpng giflib libjpeg alsaLib readline mesa
+                  pkgconfig gtk SDL autoreconfHook ];
   configureFlags = "--with-sdl --enable-fullscreen --enable-gnomeui";
-  
+
   desktopItem = makeDesktopItem {
     name = "vice";
     exec = "x64";
@@ -23,18 +25,16 @@ stdenv.mkDerivation rec {
 
   patchPhase = ''
     # Disable font-cache update
-    
     sed -i -e "s|install: install-data-am|install-no: install-data-am|" data/fonts/Makefile.am
-    autoreconf -f -i
   '';
-  
+
   NIX_LDFLAGS = "-lX11 -L${libX11}/lib";
-  
+
   postInstall = ''
     mkdir -p $out/share/applications
     cp ${desktopItem}/share/applications/* $out/share/applications
   '';
-  
+
   meta = {
     description = "Commodore 64, 128 and other emulators";
     homepage = http://www.viceteam.org;
diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix
index 1e2d656fb0ef..e031627a032d 100644
--- a/pkgs/misc/emulators/wine/base.nix
+++ b/pkgs/misc/emulators/wine/base.nix
@@ -1,5 +1,6 @@
 { stdenv, lib, pkgArches,
   name, version, src, monos, geckos, platforms,
+  pulseaudioSupport,
   buildScript ? null, configureFlags ? ""
 }:
 
@@ -19,7 +20,9 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
 
   nativeBuildInputs = toBuildInputs pkgArches (pkgs: (with pkgs; [
     freetype fontconfig mesa mesa_noglu.osmesa libdrm libpng libjpeg openssl gnutls cups ncurses
-  ]) ++ (with pkgs.xorg; [
+  ])
+  ++ lib.optional pulseaudioSupport pkgs.libpulseaudio
+  ++ (with pkgs.xorg; [
     xlibsWrapper libXi libXcursor libXinerama libXrandr libXrender libXxf86vm libXcomposite
   ]));
 
diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix
index 5261f79de107..a402fba69f67 100644
--- a/pkgs/misc/emulators/wine/default.nix
+++ b/pkgs/misc/emulators/wine/default.nix
@@ -9,11 +9,13 @@
 { lib, pkgs, system, callPackage,
   wineRelease ? "stable",
   wineBuild ? (if system == "x86_64-linux" then "wineWow" else "wine32"),
+  pulseaudioSupport ? false,
   libtxc_dxtn_Name ? "libtxc_dxtn_s2tc" }:
 
 let wine-build = build: release:
       lib.getAttr build (callPackage ./packages.nix {
         wineRelease = release;
+        inherit pulseaudioSupport;
       });
 
 in if wineRelease == "staging" then
diff --git a/pkgs/misc/emulators/wine/packages.nix b/pkgs/misc/emulators/wine/packages.nix
index ce983b993144..1a7e32efcbe1 100644
--- a/pkgs/misc/emulators/wine/packages.nix
+++ b/pkgs/misc/emulators/wine/packages.nix
@@ -1,4 +1,5 @@
 { system, stdenv, stdenv_32bit, lib, pkgs, pkgsi686Linux, fetchurl,
+  pulseaudioSupport,
   wineRelease ? "stable"
 }:
 
@@ -30,6 +31,7 @@ in {
     name = "wine-${version}";
     inherit (sources) version src;
     inherit (pkgsi686Linux) lib stdenv;
+    inherit pulseaudioSupport;
     pkgArches = [ pkgsi686Linux ];
     geckos = with sources; [ wineGecko32 ];
     monos = with sources; [ wineMono ];
@@ -39,6 +41,7 @@ in {
     name = "wine64-${version}";
     inherit (sources) version src;
     inherit lib stdenv;
+    inherit pulseaudioSupport;
     pkgArches = [ pkgs ];
     geckos = with sources; [ wineGecko64 ];
     monos = with sources; [ wineMono ];
@@ -50,6 +53,7 @@ in {
     inherit (sources) version src;
     inherit lib;
     stdenv = stdenv_32bit;
+    inherit pulseaudioSupport;
     pkgArches = [ pkgs pkgsi686Linux ];
     geckos = with sources; [ wineGecko32 wineGecko64 ];
     monos = with sources; [ wineMono ];
diff --git a/pkgs/misc/emulators/wine/staging.nix b/pkgs/misc/emulators/wine/staging.nix
index 93e2e6fd1800..da4456c0ef98 100644
--- a/pkgs/misc/emulators/wine/staging.nix
+++ b/pkgs/misc/emulators/wine/staging.nix
@@ -15,7 +15,7 @@ let v = (import ./versions.nix).staging;
 in assert (builtins.parseDrvName wineUnstable.name).version == version;
 
 stdenv.lib.overrideDerivation wineUnstable (self: {
-  nativeBuildInputs = build-inputs [ "libpulseaudio" libtxc_dxtn_Name ] self.nativeBuildInputs; 
+  nativeBuildInputs = build-inputs [ libtxc_dxtn_Name ] self.nativeBuildInputs; 
   buildInputs = build-inputs [ "perl" "utillinux" "autoconf" ] self.buildInputs;
 
   name = "${self.name}-staging";
diff --git a/pkgs/misc/emulators/wine/versions.nix b/pkgs/misc/emulators/wine/versions.nix
index 057f5214aa2e..7858a655b4e0 100644
--- a/pkgs/misc/emulators/wine/versions.nix
+++ b/pkgs/misc/emulators/wine/versions.nix
@@ -12,15 +12,16 @@ rec {
     monoSha256 = "09dwfccvfdp3walxzp6qvnyxdj2bbyw9wlh6cxw2sx43gxriys5c";
   };
   unstable = {
+    wineVersion = "1.9.0";
+    wineSha256 = "1yfmcckb8biyp1d4czjxlfd10537dpi636g3zsj1cxp7jyn228mp";
     inherit (stable)
-      wineVersion wineSha256
       geckoVersion geckoSha256
       gecko64Version gecko64Sha256
       monoVersion monoSha256;
   };
   staging = {
     version = unstable.wineVersion;
-    sha256 = "1mi2nk5cjgfrkv8g082d4klniz1dprmvvida8c30qf2j4jykn3vb";
+    sha256 = "1frp7zrgvx24m6yqmpvsz99rn18jjgg1bxl5qgcsf3kiych4i8r1";
   };
   winetricks = {
     version = "20151116";