diff options
| author | jeschli <jeschli@gmail.com> | 2018-07-09 14:31:18 +0200 |
|---|---|---|
| committer | jeschli <jeschli@gmail.com> | 2018-07-09 14:31:18 +0200 |
| commit | d1c6baf00e98a0229fc7fd96874623efc8417b05 (patch) | |
| tree | eaba9481ed208af1086690a9c07ca948b047389a /krebs/5pkgs/simple/ftb/default.nix | |
| parent | b439342e7533e3f695db8a46576c54d180f56a58 (diff) | |
| parent | d6df7ae483b984b90bdc8d4540301ef394885a98 (diff) | |
Merge remote-tracking branch 'origin/staging/jeschli'
Diffstat (limited to 'krebs/5pkgs/simple/ftb/default.nix')
| -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 |