From 66cd4111d15bb2aca7507d379b28933b2b6fff96 Mon Sep 17 00:00:00 2001 From: seth Date: Sat, 20 Apr 2024 09:31:02 -0400 Subject: [PATCH] prismlauncher-qt5: drop --- pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/all-packages.nix | 10 ++-------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c8a80540f9e8..884743471396 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1014,6 +1014,8 @@ mapAliases ({ pocket-updater-utility = pupdate; # Added 2024-01-25 poetry2nix = throw "poetry2nix is now maintained out-of-tree. Please use https://github.com/nix-community/poetry2nix/"; # Added 2023-10-26 prayer = throw "prayer has been removed from nixpkgs"; # Added 2023-11-09 + prismlauncher-qt5 = throw "'prismlauncher-qt5' has been removed from nixpkgs. Please use 'prismlauncher'"; # Added 2024-04-20 + prismlauncher-qt5-unwrapped = throw "'prismlauncher-qt5-unwrapped' has been removed from nixpkgs. Please use 'prismlauncher-unwrapped'"; # Added 2024-04-20 privacyidea = throw "privacyidea has been removed from nixpkgs"; # Added 2023-10-31 probe-rs-cli = throw "probe-rs-cli is now part of the probe-rs package"; # Added 2023-07-03 processing3 = throw "'processing3' has been renamed to/replaced by 'processing'"; # Converted to throw 2023-09-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7da15de9c8a7..ed5a6ac578fd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37370,17 +37370,11 @@ with pkgs; principia = callPackage ../games/principia { }; - prismlauncher-qt5-unwrapped = libsForQt5.callPackage ../games/prismlauncher { + prismlauncher-unwrapped = kdePackages.callPackage ../games/prismlauncher { inherit (darwin.apple_sdk.frameworks) Cocoa; }; - prismlauncher-qt5 = libsForQt5.callPackage ../games/prismlauncher/wrapper.nix { prismlauncher-unwrapped = prismlauncher-qt5-unwrapped; }; - - prismlauncher-unwrapped = qt6Packages.callPackage ../games/prismlauncher { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; - - prismlauncher = qt6Packages.callPackage ../games/prismlauncher/wrapper.nix { }; + prismlauncher = kdePackages.callPackage ../games/prismlauncher/wrapper.nix { }; pong3d = callPackage ../games/pong3d { };