From 7960c509932432fdff7200d46ab68f5fa0772152 Mon Sep 17 00:00:00 2001
From: zendo <linzway@qq.com>
Date: Sun, 25 Aug 2024 22:08:40 +0800
Subject: [PATCH 1/2] dippi: move to by-name

---
 .../graphics/dippi/default.nix => by-name/di/dippi/package.nix} | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{tools/graphics/dippi/default.nix => by-name/di/dippi/package.nix} (100%)

diff --git a/pkgs/tools/graphics/dippi/default.nix b/pkgs/by-name/di/dippi/package.nix
similarity index 100%
rename from pkgs/tools/graphics/dippi/default.nix
rename to pkgs/by-name/di/dippi/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ff352964cc01..8b4e5c150ddb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -905,8 +905,6 @@ with pkgs;
 
   umoci = callPackage ../applications/virtualization/umoci { };
 
-  dippi = callPackage ../tools/graphics/dippi { };
-
   diswall = callPackage ../applications/networking/diswall { };
 
   dupeguru = callPackage ../applications/misc/dupeguru {

From 3366d35db00602e310e25b74aa8c2b7fa75bd1a8 Mon Sep 17 00:00:00 2001
From: zendo <linzway@qq.com>
Date: Sun, 25 Aug 2024 22:14:12 +0800
Subject: [PATCH 2/2] dippi: 4.0.6 -> 4.1.0

---
 pkgs/by-name/di/dippi/package.nix | 54 ++++++++++++-------------------
 1 file changed, 21 insertions(+), 33 deletions(-)

diff --git a/pkgs/by-name/di/dippi/package.nix b/pkgs/by-name/di/dippi/package.nix
index 1a094c2750e2..14865ba980ec 100644
--- a/pkgs/by-name/di/dippi/package.nix
+++ b/pkgs/by-name/di/dippi/package.nix
@@ -1,29 +1,28 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, meson
-, ninja
-, pkg-config
-, python3
-, vala
-, glib
-, gtk3
-, gtk4
-, libadwaita
-, wrapGAppsHook4
-, appstream-glib
-, desktop-file-utils
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  meson,
+  ninja,
+  pkg-config,
+  vala,
+  glib,
+  gtk4,
+  libadwaita,
+  wrapGAppsHook4,
+  appstream-glib,
+  desktop-file-utils,
 }:
 
 stdenv.mkDerivation rec {
   pname = "dippi";
-  version = "4.0.6";
+  version = "4.1.0";
 
   src = fetchFromGitHub {
     owner = "cassidyjames";
     repo = "dippi";
     rev = version;
-    hash = "sha256-oZy8WfaAPABZRm8dm4zpI4v9RwT46F6WL6Wj767FcZg=";
+    hash = "sha256-BYI3WqMDxzERlqtq7ISQ+U1FTrpKh5OJBMo/AsdmdlQ=";
   };
 
   nativeBuildInputs = [
@@ -34,10 +33,6 @@ stdenv.mkDerivation rec {
     wrapGAppsHook4
     appstream-glib
     desktop-file-utils
-    # For post_install.py
-    python3
-    glib
-    gtk3
   ];
 
   buildInputs = [
@@ -46,19 +41,12 @@ stdenv.mkDerivation rec {
     libadwaita
   ];
 
-  postPatch = ''
-    patchShebangs build-aux/meson/post_install.py
-  '';
-
-  postInstall = ''
-    ln -s $out/bin/com.github.cassidyjames.dippi $out/bin/dippi
-  '';
-
-  meta = with lib; {
+  meta = {
     description = "Calculate display info like DPI and aspect ratio";
     homepage = "https://github.com/cassidyjames/dippi";
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ zendo ];
+    mainProgram = "com.github.cassidyjames.dippi";
+    license = lib.licenses.gpl3;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ zendo ];
   };
 }