diff options
author | Pierre Bourdon <delroth@gmail.com> | 2023-08-04 05:30:06 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-04 05:30:06 +0200 |
commit | 0805d2fc36e4f86baacd8b3e59ba89c42628c310 (patch) | |
tree | a6433a1d97ef1a7aae13233712d45f24f94e7f97 /pkgs/games | |
parent | 881d387fee59a360cfd92b34158c66e1430e8a34 (diff) | |
parent | 7ed803a136055bee137f2b7a1f29c1c2d91bbcb3 (diff) |
Merge pull request #246898 from getchoo/prism-darwin
prismlauncher: add support for darwin
Diffstat (limited to 'pkgs/games')
-rw-r--r-- | pkgs/games/prismlauncher/default.nix | 63 | ||||
-rw-r--r-- | pkgs/games/prismlauncher/wrapper.nix | 8 |
2 files changed, 54 insertions, 17 deletions
diff --git a/pkgs/games/prismlauncher/default.nix b/pkgs/games/prismlauncher/default.nix index 9df1182e1ab75..0f28a6edd4a13 100644 --- a/pkgs/games/prismlauncher/default.nix +++ b/pkgs/games/prismlauncher/default.nix @@ -1,8 +1,10 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , cmark +, Cocoa , ninja , jdk17 , zlib @@ -13,7 +15,8 @@ , ghc_filesystem , gamemode , msaClientID ? null -, gamemodeSupport ? true +, gamemodeSupport ? stdenv.isLinux +, }: let libnbtplusplus = fetchFromGitHub { @@ -23,7 +26,11 @@ let sha256 = "sha256-TvVOjkUobYJD9itQYueELJX3wmecvEdCbJ0FinW2mL4="; }; in -stdenv.mkDerivation rec { + +assert lib.assertMsg (stdenv.isLinux || !gamemodeSupport) "gamemodeSupport is only available on Linux"; + +stdenv.mkDerivation +rec { pname = "prismlauncher-unwrapped"; version = "7.2"; @@ -34,23 +41,53 @@ stdenv.mkDerivation rec { sha256 = "sha256-RArg60S91YKp1Mt97a5JNfBEOf2cmuX4pK3VAx2WfqM="; }; + patches = lib.optionals stdenv.isDarwin [ + # https://github.com/PrismLauncher/PrismLauncher/pull/1452 + # These patches allow us to disable the Sparkle updater and cmake bundling + # TODO: remove these when updating to 8.0 + (fetchpatch { + name = "disable-sparkle-when-url-is-empty.patch"; + url = "https://github.com/PrismLauncher/PrismLauncher/commit/48e50401968a72846350c6fbd76cc957b64a6b5a.patch"; + hash = "sha256-IFxp6Sj87ogQcMooV4Ql5/4B+C7oTzEk+4tlMud2OLo="; + }) + (fetchpatch { + name = "make-install_bundle-cached.patch"; + url = "https://github.com/PrismLauncher/PrismLauncher/commit/a8498b0dab94d0ab6c9e5cf395e5003db541b749.patch"; + hash = "sha256-ji5GGUnzVut9xFXkynqf9aVR9FO/zsqIbt3P9dexJ2I="; + }) + (fetchpatch { + name = "dont-include-sparkle-when-not-enabled.patch"; + url = "https://github.com/PrismLauncher/PrismLauncher/commit/51bfda937d47837ed426150ed6f43a60b4ca0ce1.patch"; + hash = "sha256-7hMgANOg4zRIf3F2AfLXGR3dAEBqVmKm/J5SH0G5oCk="; + }) + (fetchpatch { + name = "introduce-internal-updater-variable.patch"; + url = "https://github.com/PrismLauncher/PrismLauncher/commit/b1aa9e584624a0732dd55fc6c459524a8abfe6ba.patch"; + hash = "sha256-mm++EfnBxz7NVtKLMb889mMq8F/OdQmzob8OmlvNlRA="; + }) + ]; + nativeBuildInputs = [ extra-cmake-modules cmake jdk17 ninja ]; - buildInputs = [ - qtbase - zlib - quazip - ghc_filesystem - tomlplusplus - cmark - ] ++ lib.optional gamemodeSupport gamemode; + buildInputs = + [ + qtbase + zlib + quazip + ghc_filesystem + tomlplusplus + cmark + ] + ++ lib.optional gamemodeSupport gamemode + ++ lib.optionals stdenv.isDarwin [ Cocoa ]; - hardeningEnable = [ "pie" ]; + hardeningEnable = lib.optionals stdenv.isLinux [ "pie" ]; cmakeFlags = [ # downstream branding "-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 (lib.versionOlder qtbase.version "6") [ "-DLauncher_QT_VERSION_MAJOR=5" ] + ++ lib.optionals stdenv.isDarwin [ "-DINSTALL_BUNDLE=nodeps" "-DMACOSX_SPARKLE_UPDATE_FEED_URL=''" ]; postUnpack = '' rm -rf source/libraries/libnbtplusplus @@ -67,7 +104,7 @@ stdenv.mkDerivation rec { their own mods, texture packs, saves, etc) and helps you manage them and their associated options with a simple interface. ''; - platforms = platforms.linux; + platforms = with platforms; linux ++ darwin; changelog = "https://github.com/PrismLauncher/PrismLauncher/releases/tag/${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ minion3665 Scrumplex getchoo ]; diff --git a/pkgs/games/prismlauncher/wrapper.nix b/pkgs/games/prismlauncher/wrapper.nix index 57d85f4800d39..63604ea1ff5af 100644 --- a/pkgs/games/prismlauncher/wrapper.nix +++ b/pkgs/games/prismlauncher/wrapper.nix @@ -16,7 +16,7 @@ , gamemode , msaClientID ? null -, gamemodeSupport ? true +, gamemodeSupport ? stdenv.isLinux , jdks ? [ jdk17 jdk8 ] , additionalLibs ? [ ] }: @@ -38,7 +38,7 @@ symlinkJoin { qtbase qtsvg ] - ++ lib.optional (lib.versionAtLeast qtbase.version "6") qtwayland; + ++ lib.optional (lib.versionAtLeast qtbase.version "6" && stdenv.isLinux) qtwayland; postBuild = '' wrapQtAppsHook @@ -64,9 +64,9 @@ symlinkJoin { ++ additionalLibs; in - [ + [ "--prefix PRISMLAUNCHER_JAVA_PATHS : ${lib.makeSearchPath "bin/java" jdks}" ] + ++ lib.optionals stdenv.isLinux [ "--set LD_LIBRARY_PATH /run/opengl-driver/lib:${lib.makeLibraryPath libs}" - "--prefix PRISMLAUNCHER_JAVA_PATHS : ${lib.makeSearchPath "bin/java" jdks}" # xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 "--prefix PATH : ${lib.makeBinPath [xorg.xrandr]}" ]; |