summary refs log tree commit diff
path: root/pkgs/misc/emulators/wine/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/misc/emulators/wine/default.nix')
-rw-r--r--pkgs/misc/emulators/wine/default.nix22
1 files changed, 12 insertions, 10 deletions
diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix
index 8a13c61b557..3127036d68b 100644
--- a/pkgs/misc/emulators/wine/default.nix
+++ b/pkgs/misc/emulators/wine/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, xlibs, flex, bison, mesa, alsaLib
 , ncurses, libpng, libjpeg, lcms, freetype, fontconfig, fontforge
+, libxml2, libxslt, openssl
 }:
 
 assert stdenv.isLinux;
@@ -7,28 +8,29 @@ assert stdenv.isLinux;
 let lib = import ../../../lib/default.nix; in
 
 stdenv.mkDerivation {
-  name = "wine-0.9.53";
+  name = "wine-0.9.55";
 
   src = fetchurl {
-		#url = mirror://sourceforge/wine/wine-0.9.49.tar.bz2;
-		url = mirror://sourceforge/wine/wine-0.9.53.tar.bz2;
-		#sha256 = "d41edd08cf7fd21d7350a633995107533a25f925c8859995d3a6fc131f54b3c1";
-		sha256 = "06317d78b7db39458656b6acc6b265ce97f358aefd7ded679263f397a89f1200";
-	};
+    url = mirror://sourceforge/wine/wine-0.9.55.tar.bz2;
+    sha256 = "1qsyd4k7fbv8nsv3y7zi72fakpp6z1idi7afhi87qv9xgqzy3a4d";
+  };
 
   buildInputs = [
     xlibs.xlibs flex bison xlibs.libXi mesa
     xlibs.libXcursor xlibs.libXinerama xlibs.libXrandr
-    xlibs.libXrender xlibs.libXxf86vm alsaLib ncurses
-    libpng libjpeg lcms fontforge
+    xlibs.libXrender xlibs.libXxf86vm xlibs.libXcomposite
+    alsaLib ncurses libpng libjpeg lcms fontforge
+    libxml2 libxslt openssl
   ];
 
   # Wine locates a lot of libraries dynamically through dlopen().  Add
   # them to the RPATH so that the user doesn't have to set them in
   # LD_LIBRARY_PATH.
-  NIX_LDFLAGS = map (path: "-rpath " + path + "/lib") [
+  NIX_LDFLAGS = map (path: "-rpath ${path}/lib") [
     freetype fontconfig stdenv.gcc.gcc mesa mesa.libdrm
-    xlibs.libXinerama xlibs.libXrender xlibs.libXrandr xlibs.libXcursor
+    xlibs.libXinerama xlibs.libXrender xlibs.libXrandr
+    xlibs.libXcursor xlibs.libXcomposite
+    openssl
   ];
 
   # Don't shrink the ELF RPATHs in order to keep the extra RPATH