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

* Wine 0.9.54.

Browse Source 
svn path=/nixpkgs/trunk/; revision=10554
This commit is contained in:
Eelco Dolstra 2008-02-08 13:12:13 +00:00
parent 48f544d2e3
commit 960f599215
3 changed files with 13 additions and 1297 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,6 @@
{ stdenv, fetchurl, xlibs, flex, bison, mesa, alsaLib { stdenv, fetchurl, xlibs, flex, bison, mesa, alsaLib
, ncurses, libpng, libjpeg, lcms, freetype, fontconfig, fontforge , ncurses, libpng, libjpeg, lcms, freetype, fontconfig, fontforge
, libxml2, libxslt, openssl
}: }:
assert stdenv.isLinux; assert stdenv.isLinux;
@ -7,28 +8,29 @@ assert stdenv.isLinux;
let lib = import ../../../lib/default.nix; in let lib = import ../../../lib/default.nix; in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "wine-0.9.53"; name = "wine-0.9.54";
src = fetchurl { src = fetchurl {
#url = mirror://sourceforge/wine/wine-0.9.49.tar.bz2; url = mirror://sourceforge/wine/wine-0.9.54.tar.bz2;
url = mirror://sourceforge/wine/wine-0.9.53.tar.bz2; sha256 = "13wqs9a4wz5rdr6h8kanj2py38jc09bxqgd3z8idqrp3rh7pv1yf";
#sha256 = "d41edd08cf7fd21d7350a633995107533a25f925c8859995d3a6fc131f54b3c1";
sha256 = "06317d78b7db39458656b6acc6b265ce97f358aefd7ded679263f397a89f1200";
}; };
buildInputs = [ buildInputs = [
xlibs.xlibs flex bison xlibs.libXi mesa xlibs.xlibs flex bison xlibs.libXi mesa
xlibs.libXcursor xlibs.libXinerama xlibs.libXrandr xlibs.libXcursor xlibs.libXinerama xlibs.libXrandr
xlibs.libXrender xlibs.libXxf86vm alsaLib ncurses xlibs.libXrender xlibs.libXxf86vm xlibs.libXcomposite
libpng libjpeg lcms fontforge alsaLib ncurses libpng libjpeg lcms fontforge
libxml2 libxslt openssl
]; ];
# Wine locates a lot of libraries dynamically through dlopen(). Add # Wine locates a lot of libraries dynamically through dlopen(). Add
# 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 mesa.libdrm freetype fontconfig stdenv.gcc.gcc mesa mesa.libdrm
xlibs.libXinerama xlibs.libXrender xlibs.libXrandr xlibs.libXcursor xlibs.libXinerama xlibs.libXrender xlibs.libXrandr
xlibs.libXcursor xlibs.libXcomposite
openssl
]; ];
# Don't shrink the ELF RPATHs in order to keep the extra RPATH # Don't shrink the ELF RPATHs in order to keep the extra RPATH

1286
pkgs/misc/emulators/wine/opengl-child-window.patch
View File

File diff suppressed because it is too large Load Diff

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

@ -5522,7 +5522,7 @@ rec {
stdenv = overrideGCC stdenv gcc41NPTL; stdenv = overrideGCC stdenv gcc41NPTL;
inherit fetchurl flex bison mesa ncurses inherit fetchurl flex bison mesa ncurses
libpng libjpeg alsaLib lcms xlibs freetype libpng libjpeg alsaLib lcms xlibs freetype
fontconfig fontforge; fontconfig fontforge libxml2 libxslt openssl;
}; };
xsane = import ../misc/xsane { xsane = import ../misc/xsane {