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

wine: fix outputs and pulseaudio support

Browse Source
This commit is contained in:
Nikolay Amiantov 2016-04-12 18:30:28 +03:00
parent 25d2a6a1b2
commit b109f33d64
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/misc/emulators/wine/base.nix
View File

@ -14,12 +14,13 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
}) // rec { }) // rec {
inherit name src configureFlags; inherit name src configureFlags;
buildInputs = toBuildInputs pkgArches (pkgs: with pkgs; [ nativeBuildInputs = toBuildInputs pkgArches (pkgs: with pkgs; [
pkgconfig alsaLib lcms2 fontforge libxml2 libxslt makeWrapper flex bison pkgconfig fontforge makeWrapper flex bison
]); ]);
nativeBuildInputs = toBuildInputs pkgArches (pkgs: (with pkgs; [ buildInputs = toBuildInputs pkgArches (pkgs: (with pkgs; [
freetype fontconfig mesa mesa_noglu.osmesa libdrm libpng libjpeg openssl gnutls cups ncurses freetype fontconfig mesa mesa_noglu.osmesa libdrm libpng libjpeg openssl gnutls cups ncurses
alsaLib libxml2 libxslt lcms2
]) ])
++ lib.optional pulseaudioSupport pkgs.libpulseaudio ++ lib.optional pulseaudioSupport pkgs.libpulseaudio
++ (with pkgs.xorg; [ ++ (with pkgs.xorg; [
@ -29,9 +30,11 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
# 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 NIX_LDFLAGS = map (path: "-rpath " + path) (
(path: "-rpath ${path}/lib") map (x: "${x}/lib") ([ stdenv.cc.cc ] ++ buildInputs)
([ stdenv.cc.cc ] ++ nativeBuildInputs); # libpulsecommon.so is linked but not found otherwise
++ lib.optionals pulseaudioSupport (map (x: "${x}/lib/pulseaudio") (toBuildInputs pkgArches (pkgs: [ pkgs.libpulseaudio ])))
);
# 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
# elements specified above. # elements specified above.