diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix index 2c36a35ba8a..cefefb8699e 100644 --- a/pkgs/misc/emulators/wine/default.nix +++ b/pkgs/misc/emulators/wine/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, xlibs, flex, bison, mesa, alsaLib -, ncurses, libpng, libjpeg, lcms, freetype, fontforge +, ncurses, libpng, libjpeg, lcms, freetype, fontconfig, fontforge }: assert stdenv.isLinux; @@ -31,7 +31,7 @@ stdenv.mkDerivation { # them to the RPATH so that the user doesn't have to set them in # LD_LIBRARY_PATH. 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 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 208c7f90677..922a0772745 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3836,7 +3836,7 @@ rec { stdenv = overrideGCC stdenv gcc41NPTL; inherit fetchurl flex bison mesa ncurses libpng libjpeg alsaLib lcms xlibs freetype - fontforge; + fontconfig fontforge; }; xsane = import ../misc/xsane {