From eba9bbc251db942ae27f87824cae643b5f3198c2 Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Mon, 31 Jul 2023 00:24:08 +0000
Subject: [PATCH 1/2] dtrx: 8.5.1 -> 8.5.3

---
 pkgs/tools/compression/dtrx/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/compression/dtrx/default.nix b/pkgs/tools/compression/dtrx/default.nix
index ae736f18026d..83035fe26e20 100644
--- a/pkgs/tools/compression/dtrx/default.nix
+++ b/pkgs/tools/compression/dtrx/default.nix
@@ -1,5 +1,6 @@
 { lib
 , fetchFromGitHub
+, gitUpdater
 , python3Packages
 , gnutar
 , unzip
@@ -21,13 +22,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "dtrx";
-  version = "8.5.1";
+  version = "8.5.3";
 
   src = fetchFromGitHub {
     owner = "dtrx-py";
     repo = "dtrx";
-    rev = "refs/tags/${version}";
-    sha256 = "sha256-KOHafmvl17IABlcBuE7isHVCIYRbA68Dna6rgiiWlkQ=";
+    rev = version;
+    sha256 = "sha256-LB3F6jcqQPRsjFO4L2fPAPnacDAdtcaadgGbwXA9LAw=";
   };
 
   postInstall =
@@ -43,6 +44,8 @@ python3Packages.buildPythonApplication rec {
 
   nativeBuildInputs = [ python3Packages.invoke ];
 
+  passthru.updateScript = gitUpdater { };
+
   meta = with lib; {
     description = "Do The Right Extraction: A tool for taking the hassle out of extracting archives";
     homepage = "https://github.com/dtrx-py/dtrx";

From 97a9d12b6c31a58e9067eae7cdcd3f53055c124c Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Mon, 31 Jul 2023 00:30:39 +0000
Subject: [PATCH 2/2] dtrx: don't double-wrap the binary

---
 pkgs/tools/compression/dtrx/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/compression/dtrx/default.nix b/pkgs/tools/compression/dtrx/default.nix
index 83035fe26e20..2bfe975d033c 100644
--- a/pkgs/tools/compression/dtrx/default.nix
+++ b/pkgs/tools/compression/dtrx/default.nix
@@ -31,16 +31,16 @@ python3Packages.buildPythonApplication rec {
     sha256 = "sha256-LB3F6jcqQPRsjFO4L2fPAPnacDAdtcaadgGbwXA9LAw=";
   };
 
-  postInstall =
+  makeWrapperArgs =
     let
       archivers = lib.makeBinPath (
         [ gnutar lhasa rpm binutils cpio gzip p7zip cabextract unshield bzip2 xz lzip ]
         ++ lib.optional (unzipSupport) unzip
         ++ lib.optional (unrarSupport) unrar
       );
-    in ''
-      wrapProgram "$out/bin/dtrx" --prefix PATH : "${archivers}"
-    '';
+    in [
+      ''--prefix PATH : "${archivers}"''
+    ];
 
   nativeBuildInputs = [ python3Packages.invoke ];