diff options
| author | Aleksana <me@aleksana.moe> | 2024-04-27 20:03:36 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-27 20:03:36 +0800 |
| commit | 6a242fe322b0cd021d1961b3fe1d9ad761798f5f (patch) | |
| tree | 38599735a1af92fd31534a5629537452629e39b6 /pkgs/top-level | |
| parent | 03e26d995a90e52d6fbd9326a056edc6a4013121 (diff) | |
| parent | 66cd4111d15bb2aca7507d379b28933b2b6fff96 (diff) | |
Merge pull request #305556 from getchoo/pkgs/prismlauncher/drop-qt5
prismlauncher-qt5: drop
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 2 | ||||
| -rw-r--r-- | 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 b6d176e5713f7..ab41a56873f91 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1017,6 +1017,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 56a4cefd6ab6b..4f87c5df60db3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37330,17 +37330,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 { }; |