diff options
| author | Aleksana <me@aleksana.moe> | 2024-04-26 13:55:02 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-26 13:55:02 +0800 |
| commit | a427e515ff1b03544079314adffe793e9d9eddb6 (patch) | |
| tree | 276576c0bea2d9b928fd93409aec5930df81a259 /pkgs/games | |
| parent | 3770a9be203a83a21c1490c477785b49fbe21b66 (diff) | |
| parent | 117f86f9fa6d01d1041ed9186ecbdcad9e42d57f (diff) | |
Merge pull request #306370 from thecaralice/prism-macos
prismlauncher: fix darwin
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/prismlauncher/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/games/prismlauncher/wrapper.nix | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/games/prismlauncher/default.nix b/pkgs/games/prismlauncher/default.nix index ee1ba43cdf693..a2aabb72f0d7c 100644 --- a/pkgs/games/prismlauncher/default.nix +++ b/pkgs/games/prismlauncher/default.nix @@ -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 diff --git a/pkgs/games/prismlauncher/wrapper.nix b/pkgs/games/prismlauncher/wrapper.nix index d91b2731135e0..3393ff45efdcb 100644 --- a/pkgs/games/prismlauncher/wrapper.nix +++ b/pkgs/games/prismlauncher/wrapper.nix @@ -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 |