lol

Merge pull request #306370 from thecaralice/prism-macos

prismlauncher: fix darwin

authored by

Aleksana and committed by
GitHub
a427e515 3770a9be

+6 -2
+5 -1
pkgs/games/prismlauncher/default.nix
··· 60 60 "-DLauncher_BUILD_PLATFORM=nixpkgs" 61 61 ] ++ lib.optionals (msaClientID != null) [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ] 62 62 ++ lib.optionals (lib.versionOlder qtbase.version "6") [ "-DLauncher_QT_VERSION_MAJOR=5" ] 63 - ++ lib.optionals stdenv.isDarwin [ "-DINSTALL_BUNDLE=nodeps" "-DMACOSX_SPARKLE_UPDATE_FEED_URL=''" ]; 63 + ++ lib.optionals stdenv.isDarwin [ 64 + "-DINSTALL_BUNDLE=nodeps" 65 + "-DMACOSX_SPARKLE_UPDATE_FEED_URL=''" 66 + "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/Applications/" 67 + ]; 64 68 65 69 postUnpack = '' 66 70 rm -rf source/libraries/libnbtplusplus
+1 -1
pkgs/games/prismlauncher/wrapper.nix
··· 72 72 ] 73 73 ++ lib.optional (lib.versionAtLeast qtbase.version "6" && stdenv.isLinux) qtwayland; 74 74 75 - waylandPreExec = '' 75 + waylandPreExec = lib.optionalString withWaylandGLFW '' 76 76 if [ -n "$WAYLAND_DISPLAY" ]; then 77 77 export LD_LIBRARY_PATH=${lib.getLib glfw-wayland-minecraft}/lib:"$LD_LIBRARY_PATH" 78 78 fi