From 11676f8aa9850ef92fc4710d354ce2b24a08a38f Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Tue, 12 Nov 2024 14:34:41 +0000 Subject: [PATCH] minetest: format Format to match the new standards in nixpkgs --- pkgs/games/minetest/default.nix | 192 +++++++++++++++++--------------- 1 file changed, 103 insertions(+), 89 deletions(-) diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index b783765df88b..ce7fee501eb3 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -1,43 +1,44 @@ -{ lib -, stdenv -, fetchFromGitHub -, gitUpdater -, cmake -, coreutils -, libpng -, bzip2 -, curl -, libogg -, jsoncpp -, libjpeg -, libGLU -, openal -, libvorbis -, sqlite -, luajit -, freetype -, gettext -, doxygen -, ncurses -, graphviz -, xorg -, gmp -, libspatialindex -, leveldb -, postgresql -, hiredis -, libiconv -, ninja -, prometheus-cpp -, OpenGL -, OpenAL ? openal -, Carbon -, Cocoa -, Kernel -, buildClient ? true -, buildServer ? true -, SDL2 -, useSDL2 ? false +{ + lib, + stdenv, + fetchFromGitHub, + gitUpdater, + cmake, + coreutils, + libpng, + bzip2, + curl, + libogg, + jsoncpp, + libjpeg, + libGLU, + openal, + libvorbis, + sqlite, + luajit, + freetype, + gettext, + doxygen, + ncurses, + graphviz, + xorg, + gmp, + libspatialindex, + leveldb, + postgresql, + hiredis, + libiconv, + ninja, + prometheus-cpp, + OpenGL, + OpenAL ? openal, + Carbon, + Cocoa, + Kernel, + buildClient ? true, + buildServer ? true, + SDL2, + useSDL2 ? false, }: stdenv.mkDerivation (finalAttrs: { @@ -81,56 +82,66 @@ stdenv.mkDerivation (finalAttrs: { ninja ]; - buildInputs = [ - jsoncpp - gettext - freetype - sqlite - curl - bzip2 - ncurses - gmp - libspatialindex - ] ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform luajit) luajit - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libiconv - OpenGL - OpenAL - Carbon - Cocoa - Kernel - ] ++ lib.optionals buildClient [ - libpng - libjpeg - libGLU - openal - libogg - libvorbis - ] ++ lib.optionals (buildClient && useSDL2) [ - SDL2 - ] ++ lib.optionals (buildClient && !stdenv.hostPlatform.isDarwin && !useSDL2) [ - xorg.libX11 - xorg.libXi - ] ++ lib.optionals buildServer [ - leveldb - postgresql - hiredis - prometheus-cpp - ]; + buildInputs = + [ + jsoncpp + gettext + freetype + sqlite + curl + bzip2 + ncurses + gmp + libspatialindex + ] + ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform luajit) luajit + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + OpenGL + OpenAL + Carbon + Cocoa + Kernel + ] + ++ lib.optionals buildClient [ + libpng + libjpeg + libGLU + openal + libogg + libvorbis + ] + ++ lib.optionals (buildClient && useSDL2) [ + SDL2 + ] + ++ lib.optionals (buildClient && !stdenv.hostPlatform.isDarwin && !useSDL2) [ + xorg.libX11 + xorg.libXi + ] + ++ lib.optionals buildServer [ + leveldb + postgresql + hiredis + prometheus-cpp + ]; - postPatch = '' - substituteInPlace src/filesys.cpp \ - --replace-fail "/bin/rm" "${coreutils}/bin/rm" - '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - sed -i '/pagezero_size/d;/fixup_bundle/d' src/CMakeLists.txt - ''; + postPatch = + '' + substituteInPlace src/filesys.cpp \ + --replace-fail "/bin/rm" "${coreutils}/bin/rm" + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + sed -i '/pagezero_size/d;/fixup_bundle/d' src/CMakeLists.txt + ''; - postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' - patchShebangs $out - '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - mkdir -p $out/Applications - mv $out/minetest.app $out/Applications - ''; + postInstall = + lib.optionalString stdenv.hostPlatform.isLinux '' + patchShebangs $out + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p $out/Applications + mv $out/minetest.app $out/Applications + ''; doCheck = true; @@ -144,7 +155,10 @@ stdenv.mkDerivation (finalAttrs: { description = "Infinite-world block sandbox game"; license = licenses.lgpl21Plus; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ fpletz fgaz ]; + maintainers = with maintainers; [ + fpletz + fgaz + ]; mainProgram = if buildClient then "minetest" else "minetestserver"; }; })