public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Get Wine to work (basically) by linking it against Glibc 2.6 with

Browse Source 
NPTL.  Apparently Wine doesn't work with Glibc 2.5 + LinuxThreads.

svn path=/nixpkgs/trunk/; revision=9165
This commit is contained in:
Eelco Dolstra 2007-08-18 23:58:30 +00:00
parent a3a9d407da
commit a8bd020fe0
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/misc/emulators/wine/default.nix
View File

@ -2,12 +2,13 @@
mesa, libXcursor, libXinerama, libXrandr, mesa, libXcursor, libXinerama, libXrandr,
libXrender, libXxf86vm, alsaLib, ncurses, libjpeg, libXrender, libXxf86vm, alsaLib, ncurses, libjpeg,
lcms}: lcms}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "wine-0.9.42"; name = "wine-0.9.43";
src = fetchurl { src = fetchurl {
url = http://switch.dl.sourceforge.net/sourceforge/wine/wine-0.9.42.tar.bz2; url = http://switch.dl.sourceforge.net/sourceforge/wine/wine-0.9.43.tar.bz2;
sha256 = "1hjqpnwvnpgsc776jdxyl4qw38zilwcfi8krvxlv4wsq0c4isr9v"; sha256 = "0r6rz3zi5p7razn957lf2zy290hp36jrlfz4cpy23y9179r8i66x";
}; };
buildInputs = [libX11 libICE gtk flex bison libXi mesa libXcursor buildInputs = [libX11 libICE gtk flex bison libXi mesa libXcursor

13
pkgs/top-level/all-packages.nix
View File

@ -764,6 +764,8 @@ rec {
profiledCompiler = false; profiledCompiler = false;
})); }));
gcc41NPTL = wrapGCCWithGlibc gcc41.gcc glibcNPTL;
gcc42 = lowPrio (wrapGCC (import ../development/compilers/gcc-4.2 { gcc42 = lowPrio (wrapGCC (import ../development/compilers/gcc-4.2 {
inherit fetchurl stdenv noSysDirs; inherit fetchurl stdenv noSysDirs;
profiledCompiler = true; profiledCompiler = true;
@ -932,7 +934,9 @@ rec {
inherit fetchurl stdenv visualcpp windowssdk; 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; nativeTools = stdenv ? gcc && stdenv.gcc.nativeTools;
nativeLibc = stdenv ? gcc && stdenv.gcc.nativeLibc; nativeLibc = stdenv ? gcc && stdenv.gcc.nativeLibc;
gcc = baseGCC; gcc = baseGCC;
@ -3802,13 +3806,14 @@ rec {
}; };
}; };
/*wine = import ../misc/emulators/wine { wine = import ../misc/emulators/wine {
inherit fetchurl stdenv flex bison mesa ncurses stdenv = overrideGCC stdenv gcc41NPTL;
inherit fetchurl flex bison mesa ncurses
libjpeg alsaLib lcms; libjpeg alsaLib lcms;
inherit (xlibs) libX11 libICE libXi libXcursor inherit (xlibs) libX11 libICE libXi libXcursor
libXinerama libXrandr libXrender libXxf86vm; libXinerama libXrandr libXrender libXxf86vm;
inherit (gtkLibs) gtk; inherit (gtkLibs) gtk;
};*/ };
xsane = import ../misc/xsane { xsane = import ../misc/xsane {
inherit fetchurl stdenv pkgconfig libusb inherit fetchurl stdenv pkgconfig libusb