-
-
Notifications
You must be signed in to change notification settings - Fork 17.8k
etterna: init at 0.74.3 #389089
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
etterna: init at 0.74.3 #389089
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| diff --git a/src/Etterna/Singletons/DownloadManager.cpp b/src/Etterna/Singletons/DownloadManager.cpp | ||
| index b42ccd30..3606107d 100644 | ||
| --- a/src/Etterna/Singletons/DownloadManager.cpp | ||
| +++ b/src/Etterna/Singletons/DownloadManager.cpp | ||
| @@ -6265,7 +6265,10 @@ Download::Install() | ||
| { | ||
| Core::Platform::requestUserAttention(); | ||
| Message* msg; | ||
| - if (!SongManager::InstallSmzip(m_TempFileName)) | ||
| + | ||
| + auto path = FILEMAN->ResolvePath(m_TempFileName); | ||
| + | ||
| + if (!SongManager::InstallSmzip(path)) | ||
| msg = new Message("DownloadFailed"); | ||
| else | ||
| msg = new Message("PackDownloaded"); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,109 @@ | ||
| { | ||
| lib, | ||
| stdenv, | ||
| fetchFromGitHub, | ||
| makeDesktopItem, | ||
| copyDesktopItems, | ||
| # deps | ||
| cmake, | ||
| pkg-config, | ||
| openssl, | ||
| libGLU, | ||
| xorg, | ||
| alsa-lib, | ||
| libjack2, | ||
| libpulseaudio, | ||
| libogg, | ||
| sse2neon, | ||
| }: | ||
| stdenv.mkDerivation (finalAttrs: { | ||
| pname = "etterna"; | ||
| version = "0.74.3"; | ||
|
|
||
| src = fetchFromGitHub { | ||
| owner = "etternagame"; | ||
| repo = "etterna"; | ||
| tag = "v${finalAttrs.version}"; | ||
| hash = "sha256-zzCk6axISswfTAk7rRha5HFzIHQ0AjpAZyAWzH+Cn1s="; | ||
| }; | ||
|
|
||
| patches = [ ./fix-download-manager.patch ]; | ||
|
|
||
| nativeBuildInputs = [ | ||
| cmake | ||
| pkg-config | ||
|
|
||
| copyDesktopItems | ||
| ]; | ||
|
|
||
| buildInputs = [ | ||
| openssl | ||
| alsa-lib | ||
| libjack2 | ||
| libpulseaudio | ||
| libGLU | ||
| libogg | ||
| sse2neon | ||
| xorg.libXinerama | ||
| xorg.libXrandr | ||
| xorg.libX11 | ||
| xorg.libXext # Needed for DPMS | ||
| xorg.libXvMC | ||
| ]; | ||
|
|
||
| desktopItems = [ | ||
| (makeDesktopItem { | ||
| name = "etterna"; | ||
| desktopName = "Etterna"; | ||
| genericName = "Rhythm and dance game"; | ||
| icon = "etterna"; | ||
| tryExec = "etterna"; | ||
| exec = "etterna"; | ||
| categories = [ | ||
| "Application" | ||
| "Game" | ||
| "ArcadeGame" | ||
| ]; | ||
| comment = "A cross-platform rhythm video game."; | ||
| terminal = false; | ||
| }) | ||
| ]; | ||
|
|
||
| installPhase = '' | ||
| runHook preInstall | ||
| mkdir -p $out/{bin,share/etterna} | ||
| mkdir -p $out/share/applications | ||
| # copy select necessary game files into virtual fs | ||
| cp -r /build/source/{Announcers,Assets,BGAnimations,BackgroundEffects,BackgroundTransitions,Data,GameTools,NoteSkins,Scripts,Themes} "$out/share/etterna" | ||
|
|
||
| # copy binary | ||
| cp /build/source/Etterna $out/bin/.etterna-unwrapped | ||
|
|
||
| # Install the Icon | ||
| install -Dm644 /build/source/Docs/images/etterna-logo-light.svg "$out/share/icons/hicolor/scalable/apps/etterna.svg" | ||
|
|
||
| # wacky insertion of wrapper directly into phase, so that $out is set | ||
| cat > $out/bin/etterna << EOF | ||
| #!${stdenv.shell} | ||
| export ETTERNA_ROOT_DIR="\$HOME/.local/share/etterna" | ||
| export ETTERNA_ADDITIONAL_ROOT_DIRS="$out/share/etterna" | ||
| echo "HOME: \$HOME" | ||
| echo "PWD: \$(pwd)" | ||
| echo "ETTERNA_ADDITIONAL_ROOT_DIRS: \$ETTERNA_ADDITIONAL_ROOT_DIRS" | ||
| exec $out/bin/.etterna-unwrapped "\$@" | ||
| EOF | ||
| chmod +x $out/bin/etterna | ||
| runHook postInstall | ||
| ''; | ||
|
|
||
| cmakeFlags = [ "-D WITH_CRASHPAD=OFF" ]; | ||
|
|
||
| meta = { | ||
| description = "Advanced cross-platform rhythm game focused on keyboard play"; | ||
| homepage = "https://etternaonline.com"; | ||
| changelog = "https://github.com/etternagame/etterna/release/tag/v${finalAttrs.version}"; | ||
| license = lib.licenses.mit; | ||
| maintainers = with lib.maintainers; [ alikindsys ]; | ||
| mainProgram = "etterna"; | ||
| }; | ||
| }) | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.