From e8eb1a8d5c5600ccb41b59b63e1ffcf4a868ad9d Mon Sep 17 00:00:00 2001
From: Donovan Glover <donovan@dglover.co>
Date: Wed, 13 Mar 2024 05:29:47 -0400
Subject: [PATCH 1/3] qdirstat: add myself as maintainer

---
 pkgs/applications/misc/qdirstat/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/qdirstat/default.nix b/pkgs/applications/misc/qdirstat/default.nix
index dc112d2d6935..3cf201db480b 100644
--- a/pkgs/applications/misc/qdirstat/default.nix
+++ b/pkgs/applications/misc/qdirstat/default.nix
@@ -51,7 +51,7 @@ mkDerivation {
     description = "Graphical disk usage analyzer";
     homepage = src.meta.homepage;
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [ donovanglover ];
     platforms = platforms.linux;
     mainProgram = "qdirstat";
   };

From 35586e4eecc5f9f5f6021fbd7662ac848c2faa92 Mon Sep 17 00:00:00 2001
From: Donovan Glover <donovan@dglover.co>
Date: Wed, 13 Mar 2024 05:42:23 -0400
Subject: [PATCH 2/3] qdirstat: migrate to by-name

---
 .../default.nix => by-name/qd/qdirstat/package.nix}       | 8 ++++----
 pkgs/top-level/all-packages.nix                           | 2 --
 2 files changed, 4 insertions(+), 6 deletions(-)
 rename pkgs/{applications/misc/qdirstat/default.nix => by-name/qd/qdirstat/package.nix} (90%)

diff --git a/pkgs/applications/misc/qdirstat/default.nix b/pkgs/by-name/qd/qdirstat/package.nix
similarity index 90%
rename from pkgs/applications/misc/qdirstat/default.nix
rename to pkgs/by-name/qd/qdirstat/package.nix
index 3cf201db480b..f77cfcd47971 100644
--- a/pkgs/applications/misc/qdirstat/default.nix
+++ b/pkgs/by-name/qd/qdirstat/package.nix
@@ -1,6 +1,6 @@
-{ lib, fetchFromGitHub, qmake
+{ lib, fetchFromGitHub, libsForQt5
 , coreutils, xdg-utils, bash
-, makeWrapper, perlPackages, mkDerivation }:
+, makeWrapper, perlPackages }:
 
 let
   pname = "qdirstat";
@@ -14,10 +14,10 @@ let
   };
 in
 
-mkDerivation {
+libsForQt5.mkDerivation {
   inherit pname version src;
 
-  nativeBuildInputs = [ qmake makeWrapper ];
+  nativeBuildInputs = [ libsForQt5.qmake makeWrapper ];
 
   buildInputs = [ perlPackages.perl ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bab08f433b80..b9e2cfff56b1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -34427,8 +34427,6 @@ with pkgs;
 
   eiskaltdcpp = libsForQt5.callPackage ../applications/networking/p2p/eiskaltdcpp { };
 
-  qdirstat = libsForQt5.callPackage ../applications/misc/qdirstat { };
-
   qemu = callPackage ../applications/virtualization/qemu {
     inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa Hypervisor vmnet;
     inherit (darwin.stubs) rez setfile;

From 9fa8215790a5a3059382aa96f3c052aa614502fc Mon Sep 17 00:00:00 2001
From: Donovan Glover <donovan@dglover.co>
Date: Wed, 13 Mar 2024 05:54:57 -0400
Subject: [PATCH 3/3] qdirstat: cleanup

---
 pkgs/by-name/qd/qdirstat/package.nix | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/qd/qdirstat/package.nix b/pkgs/by-name/qd/qdirstat/package.nix
index f77cfcd47971..e933cafc2e80 100644
--- a/pkgs/by-name/qd/qdirstat/package.nix
+++ b/pkgs/by-name/qd/qdirstat/package.nix
@@ -1,23 +1,26 @@
-{ lib, fetchFromGitHub, libsForQt5
-, coreutils, xdg-utils, bash
-, makeWrapper, perlPackages }:
+{
+  lib,
+  fetchFromGitHub,
+  libsForQt5,
+  coreutils,
+  xdg-utils,
+  bash,
+  makeWrapper,
+  perlPackages,
+}:
 
-let
+libsForQt5.mkDerivation rec {
   pname = "qdirstat";
   version = "1.9";
 
   src = fetchFromGitHub {
     owner = "shundhammer";
-    repo = pname;
+    repo = "qdirstat";
     rev = version;
-    sha256 = "sha256-pwdmltHDNwUMx1FNOoiXl5Pna0zlKqahmicBCN6UVSU=";
+    hash = "sha256-pwdmltHDNwUMx1FNOoiXl5Pna0zlKqahmicBCN6UVSU=";
   };
-in
 
-libsForQt5.mkDerivation {
-  inherit pname version src;
-
-  nativeBuildInputs = [ libsForQt5.qmake makeWrapper ];
+  nativeBuildInputs = [ makeWrapper ] ++ (with libsForQt5; [ qmake ]);
 
   buildInputs = [ perlPackages.perl ];
 
@@ -49,7 +52,7 @@ libsForQt5.mkDerivation {
 
   meta = with lib; {
     description = "Graphical disk usage analyzer";
-    homepage = src.meta.homepage;
+    homepage = "https://github.com/shundhammer/qdirstat";
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ donovanglover ];
     platforms = platforms.linux;