From 74e18ebb6285d457982bb65c2e18a2bd3f2c32a8 Mon Sep 17 00:00:00 2001 From: GetPsyched Date: Thu, 16 May 2024 17:21:50 +0530 Subject: [PATCH] atlauncher: add options and missing libs Co-authored-by: eljamm --- pkgs/by-name/at/atlauncher/package.nix | 47 ++++++++++++++++++-------- 1 file changed, 33 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/at/atlauncher/package.nix b/pkgs/by-name/at/atlauncher/package.nix index 9d246519c263..428ffffd8836 100644 --- a/pkgs/by-name/at/atlauncher/package.nix +++ b/pkgs/by-name/at/atlauncher/package.nix @@ -6,8 +6,15 @@ , makeWrapper , stdenv +, gamemodeSupport ? stdenv.isLinux +, textToSpeechSupport ? stdenv.isLinux +, additionalLibs ? [ ] + , # dependencies - libglvnd + flite +, gamemode +, libglvnd +, libpulseaudio , udev , xorg }: @@ -30,23 +37,35 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ copyDesktopItems makeWrapper ]; - installPhase = '' - runHook preInstall + installPhase = + let + runtimeLibraries = [ + libglvnd + libpulseaudio + udev + xorg.libXxf86vm + ] + ++ lib.optional gamemodeSupport gamemode.lib + ++ lib.optional textToSpeechSupport flite + ++ additionalLibs; + in + '' + runHook preInstall - mkdir -p $out/bin $out/share/java - cp $src $out/share/java/ATLauncher.jar + mkdir -p $out/bin $out/share/java + cp $src $out/share/java/ATLauncher.jar - makeWrapper ${jre}/bin/java $out/bin/atlauncher \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libglvnd udev xorg.libXxf86vm ]}" \ - --add-flags "-jar $out/share/java/ATLauncher.jar" \ - --add-flags "--working-dir \"\''${XDG_DATA_HOME:-\$HOME/.local/share}/ATLauncher\"" \ - --add-flags "--no-launcher-update" + makeWrapper ${jre}/bin/java $out/bin/atlauncher \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeLibraries}" \ + --add-flags "-jar $out/share/java/ATLauncher.jar" \ + --add-flags "--working-dir \"\''${XDG_DATA_HOME:-\$HOME/.local/share}/ATLauncher\"" \ + --add-flags "--no-launcher-update" - mkdir -p $out/share/icons/hicolor/scalable/apps - cp $ICON $out/share/icons/hicolor/scalable/apps/atlauncher.svg + mkdir -p $out/share/icons/hicolor/scalable/apps + cp $ICON $out/share/icons/hicolor/scalable/apps/atlauncher.svg - runHook postInstall - ''; + runHook postInstall + ''; desktopItems = [ (makeDesktopItem {