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

Making wine 32bit work in x86_64, using Dolstra suggestions,

Browse Source 
which worked at first try.


svn path=/nixpkgs/trunk/; revision=14602
This commit is contained in:
Lluís Batlle i Rossell 2009-03-19 11:03:32 +00:00
parent 3969f00c27
commit 20dad1f68d
1 changed files with 12 additions and 5 deletions

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

@ -9713,7 +9713,14 @@ let
sqlite subversion pysqlite; sqlite subversion pysqlite;
}; };
wine = import ../misc/emulators/wine { wine =
if system == "x86_64-linux" then
# Can't build this in 64-bit; use a 32-bit build instead.
(import ./all-packages.nix {system = "i686-linux";}).wine
# some hackery to make nix-env show this package on x86_64...
// {system = "x86_64-linux";}
else
import ../misc/emulators/wine {
inherit fetchurl stdenv flex bison mesa ncurses inherit fetchurl stdenv flex bison mesa ncurses
libpng libjpeg alsaLib lcms xlibs freetype libpng libjpeg alsaLib lcms xlibs freetype
fontconfig fontforge libxml2 libxslt openssl; fontconfig fontforge libxml2 libxslt openssl;