From a8bd020fe0e77c4574dd9e919ccd646380956a4c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 18 Aug 2007 23:58:30 +0000
Subject: [PATCH] * Get Wine to work (basically) by linking it against Glibc
 2.6 with   NPTL.  Apparently Wine doesn't work with Glibc 2.5 + LinuxThreads.

svn path=/nixpkgs/trunk/; revision=9165
---
 pkgs/misc/emulators/wine/default.nix |  7 ++++---
 pkgs/top-level/all-packages.nix      | 13 +++++++++----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix
index 21132562311..512ab378675 100644
--- a/pkgs/misc/emulators/wine/default.nix
+++ b/pkgs/misc/emulators/wine/default.nix
@@ -2,12 +2,13 @@
 	mesa, libXcursor, libXinerama, libXrandr, 
 	libXrender, libXxf86vm, alsaLib, ncurses, libjpeg,
 	lcms}:
+
 stdenv.mkDerivation {
-  name = "wine-0.9.42";
+  name = "wine-0.9.43";
 
   src = fetchurl {
-    url = http://switch.dl.sourceforge.net/sourceforge/wine/wine-0.9.42.tar.bz2;
-    sha256 = "1hjqpnwvnpgsc776jdxyl4qw38zilwcfi8krvxlv4wsq0c4isr9v";
+    url = http://switch.dl.sourceforge.net/sourceforge/wine/wine-0.9.43.tar.bz2;
+    sha256 = "0r6rz3zi5p7razn957lf2zy290hp36jrlfz4cpy23y9179r8i66x";
   };
 
   buildInputs = [libX11 libICE gtk flex bison libXi mesa libXcursor
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d5e7160a81b..7e436fd0b4f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -764,6 +764,8 @@ rec {
     profiledCompiler = false;
   }));
 
+  gcc41NPTL = wrapGCCWithGlibc gcc41.gcc glibcNPTL;
+
   gcc42 = lowPrio (wrapGCC (import ../development/compilers/gcc-4.2 {
     inherit fetchurl stdenv noSysDirs;
     profiledCompiler = true;
@@ -932,7 +934,9 @@ rec {
     inherit fetchurl stdenv visualcpp windowssdk;
   };
 
-  wrapGCC = baseGCC: import ../build-support/gcc-wrapper {
+  wrapGCC = baseGCC: wrapGCCWithGlibc baseGCC glibc;
+
+  wrapGCCWithGlibc = baseGCC: glibc: import ../build-support/gcc-wrapper {
     nativeTools = stdenv ? gcc && stdenv.gcc.nativeTools;
     nativeLibc = stdenv ? gcc && stdenv.gcc.nativeLibc;
     gcc = baseGCC;
@@ -3802,13 +3806,14 @@ rec {
     };
   };
 
-  /*wine = import ../misc/emulators/wine {
-    inherit fetchurl stdenv flex bison mesa ncurses
+  wine = import ../misc/emulators/wine {
+    stdenv = overrideGCC stdenv gcc41NPTL;
+    inherit fetchurl flex bison mesa ncurses
 	libjpeg alsaLib lcms;
     inherit (xlibs) libX11 libICE libXi libXcursor
 	libXinerama libXrandr libXrender libXxf86vm;
     inherit (gtkLibs) gtk;
-  };*/
+  };
 
   xsane = import ../misc/xsane {
     inherit fetchurl stdenv pkgconfig libusb