-
-
Notifications
You must be signed in to change notification settings - Fork 18.1k
[Backport release-22.05] maintainers: add Scrumplex and minion3665, tomlplusplus: init at 3.2.0, prismlauncher: init at 5.0 #196721
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
SuperSandro2000
merged 6 commits into
NixOS:release-22.05
from
Minion3665:backport-196624-dependencies-to-2205
Oct 20, 2022
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
da17dc4
maintainers: add Scrumplex
Scrumplex 476bff3
tomlplusplus: init at 3.2.0
Scrumplex f9b1cf5
maintainers: add minion3665
Minion3665 0398dd7
prismlauncher: init at 5.0
Minion3665 15d4e09
release-notes-2205: suggest using prismlauncher
Minion3665 eb58a0d
multimc: suggest prismlauncher as an alternative
Minion3665 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
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,28 @@ | ||
| { lib | ||
| , stdenv | ||
| , meson | ||
| , ninja | ||
| , fetchFromGitHub | ||
| }: | ||
|
|
||
| stdenv.mkDerivation rec { | ||
| pname = "tomlplusplus"; | ||
| version = "3.2.0"; | ||
|
|
||
| src = fetchFromGitHub { | ||
| owner = "marzer"; | ||
| repo = pname; | ||
| rev = "v${version}"; | ||
| hash = "sha256-nohO4eySs73BSgjvq+uzybiE5lw2rFY5YqGbl/oqGek="; | ||
| }; | ||
|
|
||
| nativeBuildInputs = [ meson ninja ]; | ||
|
|
||
| meta = with lib;{ | ||
| homepage = "https://github.com/marzer/tomlplusplus"; | ||
| description = "Header-only TOML config file parser and serializer for C++17"; | ||
| license = licenses.mit; | ||
| maintainers = with maintainers; [ Scrumplex ]; | ||
| platforms = with platforms; unix; | ||
| }; | ||
| } |
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,94 @@ | ||
| { lib | ||
| , stdenv | ||
| , fetchFromGitHub | ||
| , cmake | ||
| , jdk8 | ||
| , jdk | ||
| , zlib | ||
| , file | ||
| , wrapQtAppsHook | ||
| , xorg | ||
| , libpulseaudio | ||
| , qtbase | ||
| , libGL | ||
| , quazip | ||
| , glfw | ||
| , openal | ||
| , extra-cmake-modules | ||
| , tomlplusplus | ||
| , ghc_filesystem | ||
| , msaClientID ? "" | ||
| , jdks ? [ jdk jdk8 ] | ||
| , | ||
| }: | ||
| let | ||
| libnbtplusplus = fetchFromGitHub { | ||
| owner = "PrismLauncher"; | ||
| repo = "libnbtplusplus"; | ||
| rev = "2203af7eeb48c45398139b583615134efd8d407f"; | ||
| sha256 = "sha256-TvVOjkUobYJD9itQYueELJX3wmecvEdCbJ0FinW2mL4="; | ||
| }; | ||
| in | ||
| stdenv.mkDerivation rec { | ||
| pname = "prismlauncher"; | ||
| version = "5.0"; | ||
|
|
||
| src = fetchFromGitHub { | ||
| owner = "PrismLauncher"; | ||
| repo = "PrismLauncher"; | ||
| rev = version; | ||
| sha256 = "sha256-oN+DpJ08N/ar5wLAahgpBV9DeHtMTwSrE7uOwT3A+Yo="; | ||
| }; | ||
|
|
||
| nativeBuildInputs = [ extra-cmake-modules ghc_filesystem cmake file jdk wrapQtAppsHook ]; | ||
| buildInputs = [ qtbase zlib quazip tomlplusplus ]; | ||
|
|
||
| cmakeFlags = lib.optionals (msaClientID != "") [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ]; | ||
| dontWrapQtApps = true; | ||
|
|
||
| postUnpack = '' | ||
| rm -rf source/libraries/libnbtplusplus | ||
| mkdir source/libraries/libnbtplusplus | ||
| ln -s ${libnbtplusplus}/* source/libraries/libnbtplusplus | ||
| chmod -R +r+w source/libraries/libnbtplusplus | ||
| chown -R $USER: source/libraries/libnbtplusplus | ||
| ''; | ||
|
|
||
| postInstall = | ||
| let | ||
| libpath = with xorg; | ||
| lib.makeLibraryPath [ | ||
| libX11 | ||
| libXext | ||
| libXcursor | ||
| libXrandr | ||
| libXxf86vm | ||
| libpulseaudio | ||
| libGL | ||
| glfw | ||
| openal | ||
| stdenv.cc.cc.lib | ||
| ]; | ||
| in | ||
| '' | ||
| # xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 | ||
| wrapQtApp $out/bin/prismlauncher \ | ||
| --set LD_LIBRARY_PATH /run/opengl-driver/lib:${libpath} \ | ||
| --prefix PRISMLAUNCHER_JAVA_PATHS : ${lib.makeSearchPath "bin/java" jdks} \ | ||
| --prefix PATH : ${lib.makeBinPath [xorg.xrandr]} | ||
| ''; | ||
|
|
||
| meta = with lib; { | ||
| homepage = "https://prismlauncher.org/"; | ||
| description = "A free, open source launcher for Minecraft"; | ||
| longDescription = '' | ||
| Allows you to have multiple, separate instances of Minecraft (each with | ||
| their own mods, texture packs, saves, etc) and helps you manage them and | ||
| their associated options with a simple interface. | ||
| ''; | ||
| platforms = platforms.linux; | ||
| changelog = "https://github.com/PrismLauncher/PrismLauncher/releases/tag/${version}"; | ||
| license = licenses.gpl3Only; | ||
| maintainers = with maintainers; [ minion3665 Scrumplex ]; | ||
| }; | ||
| } |
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
FYI you should regenerate a GPG key with more bits some time