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

* Add fontconfig to Wine's RPATH.

Browse Source 
svn path=/nixpkgs/trunk/; revision=9228
This commit is contained in:
Eelco Dolstra 2007-08-31 12:14:36 +00:00
parent d8046322a9
commit 44690411ef
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
{ stdenv, fetchurl, xlibs, flex, bison, mesa, alsaLib { stdenv, fetchurl, xlibs, flex, bison, mesa, alsaLib
, ncurses, libpng, libjpeg, lcms, freetype, fontforge , ncurses, libpng, libjpeg, lcms, freetype, fontconfig, fontforge
}: }:
assert stdenv.isLinux; assert stdenv.isLinux;
@ -31,7 +31,7 @@ stdenv.mkDerivation {
# 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 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
]; ];

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

@ -3836,7 +3836,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
fontforge; fontconfig fontforge;
}; };
xsane = import ../misc/xsane { xsane = import ../misc/xsane {