mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-24 07:53:19 +00:00
Making wine 32bit work in x86_64, using Dolstra suggestions,
which worked at first try. svn path=/nixpkgs/trunk/; revision=14602
This commit is contained in:
parent
3969f00c27
commit
20dad1f68d
@ -9713,11 +9713,18 @@ let
|
||||
sqlite subversion pysqlite;
|
||||
};
|
||||
|
||||
wine = import ../misc/emulators/wine {
|
||||
inherit fetchurl stdenv flex bison mesa ncurses
|
||||
libpng libjpeg alsaLib lcms xlibs freetype
|
||||
fontconfig fontforge libxml2 libxslt openssl;
|
||||
};
|
||||
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
|
||||
libpng libjpeg alsaLib lcms xlibs freetype
|
||||
fontconfig fontforge libxml2 libxslt openssl;
|
||||
};
|
||||
|
||||
xosd = import ../misc/xosd {
|
||||
inherit fetchurl stdenv;
|
||||
|
Loading…
Reference in New Issue
Block a user