diff options
| author | tv <tv@krebsco.de> | 2018-07-17 20:22:52 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2018-07-17 20:22:52 +0200 |
| commit | 3dedfb8de4dc7e741f4db5310739884fba68b5bd (patch) | |
| tree | 25e2955462d2998afe04356128f9d464d1b40b52 /krebs/5pkgs/simple/ftb | |
| parent | 75aa3b118b6c74b2e87ccf7e3da53aa06fa7d569 (diff) | |
| parent | 74698c904460db569a3c6c8355c0b25a94c98800 (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'krebs/5pkgs/simple/ftb')
| -rw-r--r-- | krebs/5pkgs/simple/ftb/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/krebs/5pkgs/simple/ftb/default.nix b/krebs/5pkgs/simple/ftb/default.nix index c2e83c9f4..ab7d6e651 100644 --- a/krebs/5pkgs/simple/ftb/default.nix +++ b/krebs/5pkgs/simple/ftb/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl , jre, libX11, libXext, libXcursor, libXrandr, libXxf86vm , openjdk -, mesa, openal +, mesa_glu, openal , useAlsa ? false, alsaOss ? null }: with stdenv.lib; @@ -26,7 +26,7 @@ stdenv.mkDerivation { #!${stdenv.shell} export _JAVA_AWT_WM_NONREPARENTING=1 - export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm mesa openal ]} + export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm mesa_glu openal ]} ${if useAlsa then "${alsaOss}/bin/aoss" else "" } \ ${jre}/bin/java -jar $out/ftb.jar EOF |