AstralTransRocketries/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-09-18 00:20:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

style(nix): format with modern nixfmt (#4066)

Browse Source
This commit is contained in:
Seth Flynn 2025-08-18 12:16:13 -04:00 committed by GitHub
commit accb3382aa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 57 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
nix/unwrapped.nix
View File

@ -76,35 +76,33 @@ stdenv.mkDerivation {
stripJavaArchivesHook stripJavaArchivesHook
]; ];
buildInputs = buildInputs = [
[ cmark
cmark kdePackages.qtbase
kdePackages.qtbase kdePackages.qtnetworkauth
kdePackages.qtnetworkauth kdePackages.quazip
kdePackages.quazip tomlplusplus
tomlplusplus zlib
zlib ]
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ] ++ lib.optional gamemodeSupport gamemode;
++ lib.optional gamemodeSupport gamemode;
hardeningEnable = lib.optionals stdenv.hostPlatform.isLinux [ "pie" ]; hardeningEnable = lib.optionals stdenv.hostPlatform.isLinux [ "pie" ];
cmakeFlags = cmakeFlags = [
[ # downstream branding
# downstream branding (lib.cmakeFeature "Launcher_BUILD_PLATFORM" "nixpkgs")
(lib.cmakeFeature "Launcher_BUILD_PLATFORM" "nixpkgs") ]
] ++ lib.optionals (msaClientID != null) [
++ lib.optionals (msaClientID != null) [ (lib.cmakeFeature "Launcher_MSA_CLIENT_ID" (toString msaClientID))
(lib.cmakeFeature "Launcher_MSA_CLIENT_ID" (toString msaClientID)) ]
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
++ lib.optionals stdenv.hostPlatform.isDarwin [ # we wrap our binary manually
# we wrap our binary manually (lib.cmakeFeature "INSTALL_BUNDLE" "nodeps")
(lib.cmakeFeature "INSTALL_BUNDLE" "nodeps") # disable built-in updater
# disable built-in updater (lib.cmakeFeature "MACOSX_SPARKLE_UPDATE_FEED_URL" "''")
(lib.cmakeFeature "MACOSX_SPARKLE_UPDATE_FEED_URL" "''") (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "${placeholder "out"}/Applications/")
(lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "${placeholder "out"}/Applications/") ];
];
doCheck = true; doCheck = true;

67
nix/wrapper.nix
View File

@ -61,14 +61,13 @@ symlinkJoin {
nativeBuildInputs = [ kdePackages.wrapQtAppsHook ]; nativeBuildInputs = [ kdePackages.wrapQtAppsHook ];
buildInputs = buildInputs = [
[ kdePackages.qtbase
kdePackages.qtbase kdePackages.qtsvg
kdePackages.qtsvg ]
] ++ lib.optional (
++ lib.optional ( lib.versionAtLeast kdePackages.qtbase.version "6" && stdenv.hostPlatform.isLinux
lib.versionAtLeast kdePackages.qtbase.version "6" && stdenv.hostPlatform.isLinux ) kdePackages.qtwayland;
) kdePackages.qtwayland;
postBuild = '' postBuild = ''
wrapQtAppsHook wrapQtAppsHook
@ -76,41 +75,41 @@ symlinkJoin {
qtWrapperArgs = qtWrapperArgs =
let let
runtimeLibs = runtimeLibs = [
[ (lib.getLib stdenv.cc.cc)
(lib.getLib stdenv.cc.cc) ## native versions
## native versions glfw3-minecraft
glfw3-minecraft openal
openal
## openal ## openal
alsa-lib alsa-lib
libjack2 libjack2
libpulseaudio libpulseaudio
pipewire pipewire
## glfw ## glfw
libGL libGL
libX11 libX11
libXcursor libXcursor
libXext libXext
libXrandr libXrandr
libXxf86vm libXxf86vm
udev # oshi udev # oshi
vulkan-loader # VulkanMod's lwjgl vulkan-loader # VulkanMod's lwjgl
] ]
++ lib.optional textToSpeechSupport flite ++ lib.optional textToSpeechSupport flite
++ lib.optional gamemodeSupport gamemode.lib ++ lib.optional gamemodeSupport gamemode.lib
++ lib.optional controllerSupport libusb1 ++ lib.optional controllerSupport libusb1
++ additionalLibs; ++ additionalLibs;
runtimePrograms = [ runtimePrograms = [
mesa-demos mesa-demos
pciutils # need lspci pciutils # need lspci
xrandr # needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 xrandr # needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
] ++ additionalPrograms; ]
++ additionalPrograms;
in in
[ "--prefix PRISMLAUNCHER_JAVA_PATHS : ${lib.makeSearchPath "bin/java" jdks}" ] [ "--prefix PRISMLAUNCHER_JAVA_PATHS : ${lib.makeSearchPath "bin/java" jdks}" ]