diff --git a/pkgs/games/polymc/default.nix b/pkgs/games/polymc/default.nix deleted file mode 100644 index 53c1647aa990..000000000000 --- a/pkgs/games/polymc/default.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, jdk8 -, jdk -, zlib -, file -, wrapQtAppsHook -, xorg -, libpulseaudio -, qtbase -, libGL -, quazip -, glfw -, openal -, msaClientID ? "" -, jdks ? [ jdk jdk8 ] -, extra-cmake-modules -}: - -stdenv.mkDerivation rec { - pname = "polymc"; - version = "1.4.2"; - - src = fetchFromGitHub { - owner = "PolyMC"; - repo = "PolyMC"; - rev = version; - sha256 = "sha256-mqLk7ZcSrtvlUziNUCtnH7xQplXBruuiuN2b1+VX1ng="; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ extra-cmake-modules cmake file jdk wrapQtAppsHook ]; - buildInputs = [ qtbase zlib quazip ]; - - cmakeFlags = lib.optionals (msaClientID != "") [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ]; - - dontWrapQtApps = true; - - 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/polymc \ - --set LD_LIBRARY_PATH /run/opengl-driver/lib:${libpath} \ - --prefix POLYMC_JAVA_PATHS : ${lib.makeSearchPath "bin/java" jdks} \ - --prefix PATH : ${lib.makeBinPath [ xorg.xrandr ]} - ''; - - meta = with lib; { - homepage = "https://polymc.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/PolyMC/PolyMC/releases/tag/${version}"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ cleverca22 starcraft66 ]; - knownVulnerabilities = [ "OVE-20221017-0001" ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3be29c104b19..7788125d5b06 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -930,7 +930,7 @@ mapAliases ({ mpich2 = throw "'mpich2' has been renamed to/replaced by 'mpich'"; # Converted to throw 2022-02-22 mqtt-bench = throw "mqtt-bench has been dropped due to the lack of maintenance from upstream since 2017"; # Added 2022-06-02 msf = throw "'msf' has been renamed to/replaced by 'metasploit'"; # Converted to throw 2022-02-22 - multimc = throw "multimc was removed from nixpkgs; use polymc instead (see https://github.com/NixOS/nixpkgs/pull/154051 for more information)"; # Added 2022-01-08 + multimc = throw "multimc was removed from nixpkgs; use prismlauncher instead (see https://github.com/NixOS/nixpkgs/pull/154051 for more information)"; # Added 2022-01-08 mumble_git = pkgs.mumble; # Added 2019-08-01 murmur_git = pkgs.murmur; # Added 2019-08-01 mutt-with-sidebar = mutt; # Added 2022-09-17 @@ -1147,6 +1147,7 @@ mapAliases ({ pmtools = throw "'pmtools' has been renamed to/replaced by 'acpica-tools'"; # Converted to throw 2022-02-22 pocketsphinx = throw "pocketsphinx has been removed: unmaintained"; # Added 2022-04-24 polarssl = throw "'polarssl' has been renamed to/replaced by 'mbedtls'"; # Converted to throw 2022-02-22 + polymc = throw "PolyMC has been removed from nixpkgs due to a hostile takeover by a rogue maintainer. The rest of the maintainers have made a fork which is packaged as 'prismlauncher'"; # Added 2022-10-18 polysh = throw "polysh has been removed from nixpkgs as the upstream has abandoned the project"; # Added 2022-01-01 pond = throw "pond has been dropped due to the lack of maintanence from upstream since 2016"; # Added 2022-06-02 poppler_qt5 = throw "'poppler_qt5' has been renamed to/replaced by 'libsForQt5.poppler'"; # Converted to throw 2022-02-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f6aa49b0c48e..600a81e9f6d6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34188,8 +34188,6 @@ with pkgs; planetary_annihilation = callPackage ../games/planetaryannihilation { }; - polymc = libsForQt5.callPackage ../games/polymc { }; - prismlauncher = libsForQt5.callPackage ../games/prismlauncher { }; pong3d = callPackage ../games/pong3d { };