Merge pull request #306370 from thecaralice/prism-macos

prismlauncher: fix darwin
This commit is contained in:
Aleksana 2024-04-26 13:55:02 +08:00 committed by GitHub
commit a427e515ff
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 2 deletions

View File

@ -60,7 +60,11 @@ stdenv.mkDerivation (finalAttrs: {
"-DLauncher_BUILD_PLATFORM=nixpkgs"
] ++ lib.optionals (msaClientID != null) [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ]
++ lib.optionals (lib.versionOlder qtbase.version "6") [ "-DLauncher_QT_VERSION_MAJOR=5" ]
++ lib.optionals stdenv.isDarwin [ "-DINSTALL_BUNDLE=nodeps" "-DMACOSX_SPARKLE_UPDATE_FEED_URL=''" ];
++ lib.optionals stdenv.isDarwin [
"-DINSTALL_BUNDLE=nodeps"
"-DMACOSX_SPARKLE_UPDATE_FEED_URL=''"
"-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/Applications/"
];
postUnpack = ''
rm -rf source/libraries/libnbtplusplus

View File

@ -72,7 +72,7 @@ symlinkJoin {
]
++ lib.optional (lib.versionAtLeast qtbase.version "6" && stdenv.isLinux) qtwayland;
waylandPreExec = ''
waylandPreExec = lib.optionalString withWaylandGLFW ''
if [ -n "$WAYLAND_DISPLAY" ]; then
export LD_LIBRARY_PATH=${lib.getLib glfw-wayland-minecraft}/lib:"$LD_LIBRARY_PATH"
fi