From 97147f2d24cc4316d581a2b4bab334d8ad2161f3 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Tue, 18 Jun 2024 22:31:41 +0300
Subject: [PATCH] fix(nix): drop unsupported Qt 5 package

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 flake.lock           |  6 +++---
 flake.nix            |  2 +-
 nix/distribution.nix | 15 ++-------------
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/flake.lock b/flake.lock
index e6b9ced5d..caed1a708 100644
--- a/flake.lock
+++ b/flake.lock
@@ -77,14 +77,14 @@
       "locked": {
         "lastModified": 1718276985,
         "narHash": "sha256-u1fA0DYQYdeG+5kDm1bOoGcHtX0rtC7qs2YA2N1X++I=",
-        "owner": "nixos",
+        "owner": "NixOS",
         "repo": "nixpkgs",
         "rev": "3f84a279f1a6290ce154c5531378acc827836fbb",
         "type": "github"
       },
       "original": {
-        "owner": "nixos",
-        "ref": "nixpkgs-unstable",
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index e16c76699..7cef5217a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,7 +7,7 @@
   };
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     flake-parts = {
       url = "github:hercules-ci/flake-parts";
       inputs.nixpkgs-lib.follows = "nixpkgs";
diff --git a/nix/distribution.nix b/nix/distribution.nix
index 01c90f783..d9c6784a1 100644
--- a/nix/distribution.nix
+++ b/nix/distribution.nix
@@ -13,8 +13,6 @@
     in {
       inherit
         (ourPackages)
-        prismlauncher-qt5-unwrapped
-        prismlauncher-qt5
         prismlauncher-unwrapped
         prismlauncher
         ;
@@ -25,21 +23,12 @@
   flake = {
     overlays.default = final: prev: let
       version = builtins.substring 0 8 self.lastModifiedDate or "dirty";
-
-      # common args for prismlauncher evaluations
-      unwrappedArgs = {
+    in {
+      prismlauncher-unwrapped = prev.qt6Packages.callPackage ./pkg {
         inherit (inputs) libnbtplusplus;
         inherit ((final.darwin or prev.darwin).apple_sdk.frameworks) Cocoa;
         inherit version;
       };
-    in {
-      prismlauncher-qt5-unwrapped = prev.libsForQt5.callPackage ./pkg unwrappedArgs;
-
-      prismlauncher-qt5 = prev.libsForQt5.callPackage ./pkg/wrapper.nix {
-        prismlauncher-unwrapped = final.prismlauncher-qt5-unwrapped;
-      };
-
-      prismlauncher-unwrapped = prev.qt6Packages.callPackage ./pkg unwrappedArgs;
 
       prismlauncher = prev.qt6Packages.callPackage ./pkg/wrapper.nix {
         inherit (final) prismlauncher-unwrapped;