From c458862baf3923250e29b7f8e9062f1514a795c7 Mon Sep 17 00:00:00 2001 From: GetPsyched Date: Tue, 9 Jul 2024 19:25:10 +0400 Subject: [PATCH 1/2] atlauncher: format with nixfmt --- pkgs/by-name/at/atlauncher/package.nix | 59 ++++++++++++++------------ 1 file changed, 32 insertions(+), 27 deletions(-) diff --git a/pkgs/by-name/at/atlauncher/package.nix b/pkgs/by-name/at/atlauncher/package.nix index a4223aa3a096..7a5dffc16b5d 100644 --- a/pkgs/by-name/at/atlauncher/package.nix +++ b/pkgs/by-name/at/atlauncher/package.nix @@ -1,22 +1,23 @@ -{ copyDesktopItems -, fetchurl -, jre -, lib -, makeDesktopItem -, makeWrapper -, stdenvNoCC +{ + copyDesktopItems, + fetchurl, + jre, + lib, + makeDesktopItem, + makeWrapper, + stdenvNoCC, -, gamemodeSupport ? stdenvNoCC.isLinux -, textToSpeechSupport ? stdenvNoCC.isLinux -, additionalLibs ? [ ] + gamemodeSupport ? stdenvNoCC.isLinux, + textToSpeechSupport ? stdenvNoCC.isLinux, + additionalLibs ? [ ], -, # dependencies - flite -, gamemode -, libglvnd -, libpulseaudio -, udev -, xorg + # dependencies + flite, + gamemode, + libglvnd, + libpulseaudio, + udev, + xorg, }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -35,19 +36,23 @@ stdenvNoCC.mkDerivation (finalAttrs: { dontUnpack = true; - nativeBuildInputs = [ copyDesktopItems makeWrapper ]; + nativeBuildInputs = [ + copyDesktopItems + makeWrapper + ]; installPhase = let - runtimeLibraries = [ - libglvnd - libpulseaudio - udev - xorg.libXxf86vm - ] - ++ lib.optional gamemodeSupport gamemode.lib - ++ lib.optional textToSpeechSupport flite - ++ additionalLibs; + runtimeLibraries = + [ + libglvnd + libpulseaudio + udev + xorg.libXxf86vm + ] + ++ lib.optional gamemodeSupport gamemode.lib + ++ lib.optional textToSpeechSupport flite + ++ additionalLibs; in '' runHook preInstall From 863c65e63df8b213a6d93199e5ff3a970fb38ba4 Mon Sep 17 00:00:00 2001 From: GetPsyched Date: Tue, 9 Jul 2024 19:25:48 +0400 Subject: [PATCH 2/2] atlauncher: add missing libraries --- pkgs/by-name/at/atlauncher/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/at/atlauncher/package.nix b/pkgs/by-name/at/atlauncher/package.nix index 7a5dffc16b5d..876b68fa86a1 100644 --- a/pkgs/by-name/at/atlauncher/package.nix +++ b/pkgs/by-name/at/atlauncher/package.nix @@ -48,6 +48,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { libglvnd libpulseaudio udev + xorg.libX11 + xorg.libXcursor xorg.libXxf86vm ] ++ lib.optional gamemodeSupport gamemode.lib