diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-03-19 11:03:32 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-03-19 11:03:32 +0000 |
| commit | 20dad1f68df281e80bd1f8653b60835c958b66cb (patch) | |
| tree | 941f65f54cabe52361db4c6a8c9bcc9ab35f81e8 /pkgs | |
| parent | 3969f00c270cdfd557e22c303a80f03ecd08ce95 (diff) | |
| download | nixlib-20dad1f68df281e80bd1f8653b60835c958b66cb.tar nixlib-20dad1f68df281e80bd1f8653b60835c958b66cb.tar.gz nixlib-20dad1f68df281e80bd1f8653b60835c958b66cb.tar.bz2 nixlib-20dad1f68df281e80bd1f8653b60835c958b66cb.tar.lz nixlib-20dad1f68df281e80bd1f8653b60835c958b66cb.tar.xz nixlib-20dad1f68df281e80bd1f8653b60835c958b66cb.tar.zst nixlib-20dad1f68df281e80bd1f8653b60835c958b66cb.zip | |
Making wine 32bit work in x86_64, using Dolstra suggestions,
which worked at first try. svn path=/nixpkgs/trunk/; revision=14602
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e5fc0f015626..680e692acc9c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; |