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

enable osmesa for wine (close #1228)

This commit is contained in:
Vladimír Čunát 2013-11-16 23:21:22 +01:00
parent 93ecc63614
commit 1d6c351046
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, xlibs, flex, bison, mesa, alsaLib { stdenv, fetchurl, pkgconfig, xlibs, flex, bison, mesa, mesa_noglu, alsaLib
, ncurses, libpng, libjpeg, lcms, freetype, fontconfig, fontforge , ncurses, libpng, libjpeg, lcms, freetype, fontconfig, fontforge
, libxml2, libxslt, openssl, gnutls, cups, libdrm, makeWrapper , libxml2, libxslt, openssl, gnutls, cups, libdrm, makeWrapper
}: }:
@ -34,7 +34,8 @@ in stdenv.mkDerivation rec {
inherit version name src; inherit version name src;
buildInputs = [ buildInputs = [
xlibs.xlibs flex bison xlibs.libXi mesa pkgconfig
xlibs.xlibs flex bison xlibs.libXi mesa mesa_noglu.osmesa
xlibs.libXcursor xlibs.libXinerama xlibs.libXrandr xlibs.libXcursor xlibs.libXinerama xlibs.libXrandr
xlibs.libXrender xlibs.libXxf86vm xlibs.libXcomposite xlibs.libXrender xlibs.libXxf86vm xlibs.libXcomposite
alsaLib ncurses libpng libjpeg lcms fontforge alsaLib ncurses libpng libjpeg lcms fontforge
@ -45,7 +46,7 @@ in stdenv.mkDerivation rec {
# them to the RPATH so that the user doesn't have to set them in # them to the RPATH so that the user doesn't have to set them in
# LD_LIBRARY_PATH. # LD_LIBRARY_PATH.
NIX_LDFLAGS = map (path: "-rpath ${path}/lib ") [ NIX_LDFLAGS = map (path: "-rpath ${path}/lib ") [
freetype fontconfig stdenv.gcc.gcc mesa libdrm freetype fontconfig stdenv.gcc.gcc mesa mesa_noglu.osmesa libdrm
xlibs.libXinerama xlibs.libXrender xlibs.libXrandr xlibs.libXinerama xlibs.libXrender xlibs.libXrandr
xlibs.libXcursor xlibs.libXcomposite libpng libjpeg xlibs.libXcursor xlibs.libXcomposite libpng libjpeg
openssl gnutls cups openssl gnutls cups

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, xlibs, flex, bison, mesa, alsaLib { stdenv, fetchurl, pkgconfig, xlibs, flex, bison, mesa, mesa_noglu, alsaLib
, ncurses, libpng, libjpeg, lcms, freetype, fontconfig, fontforge , ncurses, libpng, libjpeg, lcms, freetype, fontconfig, fontforge
, libxml2, libxslt, openssl, gnutls, cups, libdrm, makeWrapper , libxml2, libxslt, openssl, gnutls, cups, libdrm, makeWrapper
}: }:
@ -34,7 +34,8 @@ in stdenv.mkDerivation rec {
inherit version name src; inherit version name src;
buildInputs = [ buildInputs = [
xlibs.xlibs flex bison xlibs.libXi mesa pkgconfig
xlibs.xlibs flex bison xlibs.libXi mesa mesa_noglu.osmesa
xlibs.libXcursor xlibs.libXinerama xlibs.libXrandr xlibs.libXcursor xlibs.libXinerama xlibs.libXrandr
xlibs.libXrender xlibs.libXxf86vm xlibs.libXcomposite xlibs.libXrender xlibs.libXxf86vm xlibs.libXcomposite
alsaLib ncurses libpng libjpeg lcms fontforge alsaLib ncurses libpng libjpeg lcms fontforge
@ -45,7 +46,7 @@ in stdenv.mkDerivation rec {
# them to the RPATH so that the user doesn't have to set them in # them to the RPATH so that the user doesn't have to set them in
# LD_LIBRARY_PATH. # LD_LIBRARY_PATH.
NIX_LDFLAGS = map (path: "-rpath ${path}/lib ") [ NIX_LDFLAGS = map (path: "-rpath ${path}/lib ") [
freetype fontconfig stdenv.gcc.gcc mesa libdrm freetype fontconfig stdenv.gcc.gcc mesa mesa_noglu.osmesa libdrm
xlibs.libXinerama xlibs.libXrender xlibs.libXrandr xlibs.libXinerama xlibs.libXrender xlibs.libXrandr
xlibs.libXcursor xlibs.libXcomposite libpng libjpeg xlibs.libXcursor xlibs.libXcomposite libpng libjpeg
openssl gnutls cups openssl gnutls cups