From 1d1dc7798ded248dfa67f950e7a97c24a8a76964 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 18 Jan 2022 19:03:11 +0100 Subject: [PATCH] tlauncher: remove tlauncher has a shady past (https://github.com/NixOS/nixpkgs/pull/152744#issuecomment-1014125073) offers torrents on their website with cracked games and the discussion in their reddit is primarly around cracked Mincraft versions. This reverts commit ed4ece3f4437749aacdae7e5c7d109dc52489826. --- pkgs/games/tlauncher/default.nix | 100 ------------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 102 deletions(-) delete mode 100644 pkgs/games/tlauncher/default.nix diff --git a/pkgs/games/tlauncher/default.nix b/pkgs/games/tlauncher/default.nix deleted file mode 100644 index 48cfac1f582c..000000000000 --- a/pkgs/games/tlauncher/default.nix +++ /dev/null @@ -1,100 +0,0 @@ -{ lib -, stdenv -, openjdk8 -, buildFHSUserEnv -, fetchzip -, fetchurl -, copyDesktopItems -, makeDesktopItem -}: -let - version = "2.839"; - src = stdenv.mkDerivation { - pname = "tlauncher"; - inherit version; - src = fetchzip { - name = "tlauncher.zip"; - url = "https://dl2.tlauncher.org/f.php?f=files%2FTLauncher-${version}.zip"; - sha256 = "sha256-KphpNuTucpuJhXspKxqDyYQN6vbpY0XCB3GAd5YCGbc="; - stripRoot = false; - }; - installPhase = '' - cp $src/*.jar $out - ''; - }; - fhs = buildFHSUserEnv { - name = "tlauncher"; - runScript = '' - ${openjdk8}/bin/java -jar "${src}" "$@" - ''; - targetPkgs = pkgs: with pkgs; [ - alsa-lib - cpio - cups - file - fontconfig - freetype - giflib - glib - gnome2.GConf - gnome2.gnome_vfs - gtk2 - libjpeg - libGL - openjdk8-bootstrap - perl - which - xorg.libICE - xorg.libX11 - xorg.libXcursor - xorg.libXext - xorg.libXi - xorg.libXinerama - xorg.libXrandr - xorg.xrandr - xorg.libXrender - xorg.libXt - xorg.libXtst - xorg.libXtst - xorg.libXxf86vm - zip - zlib - ]; - }; - desktopItem = makeDesktopItem { - name = "tlauncher"; - exec = "tlauncher"; - icon = fetchurl { - url = "https://styles.redditmedia.com/t5_2o8oax/styles/communityIcon_gu5r5v8eaiq51.png"; - sha256 = "sha256-ma8zxaUxdAw5VYfOK8i8s1kjwMgs80Eomq43Cb0HZWw="; - }; - comment = "Minecraft launcher"; - desktopName = "TLauncher"; - categories = "Game;"; - }; -in stdenv.mkDerivation { - pname = "tlauncher-wrapper"; - inherit version; - - dontUnpack = true; - - installPhase = '' - runHook preInstall - - mkdir $out/{bin,share/applications} -p - install ${fhs}/bin/tlauncher $out/bin - - runHook postInstall - ''; - - nativeBuildInputs = [ copyDesktopItems ]; - desktopItems = [ desktopItem ]; - - meta = with lib; { - description = "Minecraft launcher that already deal with forge, optifine and mods"; - homepage = "https://tlauncher.org/"; - maintainers = with maintainers; [ lucasew ]; - license = licenses.unfree; - platforms = openjdk8.meta.platforms; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 0118bd5473bf..e003e62f8ba2 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -782,6 +782,7 @@ mapAliases ({ pgtap = postgresqlPackages.pgtap; plv8 = postgresqlPackages.plv8; timescaledb = postgresqlPackages.timescaledb; + tlauncher = throw "tlauncher has been removed because there questionable practices and legality concerns"; tsearch_extras = postgresqlPackages.tsearch_extras; cstore_fdw = postgresqlPackages.cstore_fdw; pg_hll = postgresqlPackages.pg_hll; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1e39d0e6977b..a682ce6a3673 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30931,8 +30931,6 @@ with pkgs; portmod = callPackage ../games/portmod { }; - tlauncher = callPackage ../games/tlauncher { }; - tr-patcher = callPackage ../games/tr-patcher { }; tes3cmd = callPackage ../games/tes3cmd { };