From 45f1d701019d43b63299e8a0bb79055f6dfc190e Mon Sep 17 00:00:00 2001
From: psondej <patryk.sondej@grupawp.pl>
Date: Wed, 21 Dec 2022 16:03:55 +0100
Subject: [PATCH 1/2] pwndbg: 2022.08.30 -> 2022.12.19

---
 .../development/tools/misc/pwndbg/default.nix | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/tools/misc/pwndbg/default.nix b/pkgs/development/tools/misc/pwndbg/default.nix
index 023b759c32e2..ff94a8e3183a 100644
--- a/pkgs/development/tools/misc/pwndbg/default.nix
+++ b/pkgs/development/tools/misc/pwndbg/default.nix
@@ -8,38 +8,45 @@
 
 let
   pythonPath = with python3.pkgs; makePythonPath [
+    capstone
     future
-    isort
     psutil
+    pwntools
     pycparser
     pyelftools
-    python-ptrace
-    ropgadget
-    six
-    unicorn
     pygments
+    unicorn
+    rpyc
   ];
+  binPath = lib.makeBinPath ([
+    python3.pkgs.pwntools   # ref: https://github.com/pwndbg/pwndbg/blob/2022.12.19/pwndbg/wrappers/checksec.py#L8
+  ] ++ lib.optionals stdenv.isLinux [
+    python3.pkgs.ropper     # ref: https://github.com/pwndbg/pwndbg/blob/2022.12.19/pwndbg/commands/ropper.py#L30
+    python3.pkgs.ROPGadget  # ref: https://github.com/pwndbg/pwndbg/blob/2022.12.19/pwndbg/commands/rop.py#L32
+  ]);
 
 in stdenv.mkDerivation rec {
   pname = "pwndbg";
-  version = "2022.08.30";
+  version = "2022.12.19";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "pwndbg";
     repo = "pwndbg";
     rev = version;
-    sha256 = "sha256-rMdpNJonzbHyTXbnr6MtlVUmfAfLiCHaVSzuQRhtVpE=";
+    sha256 = "sha256-pyY2bMasd6GaJZZjLF48SvkKUBw3XfVa0g3Q0LiEi4k=";
+    fetchSubmodules = true;
   };
 
   nativeBuildInputs = [ makeWrapper ];
 
   installPhase = ''
     mkdir -p $out/share/pwndbg
-    cp -r *.py pwndbg $out/share/pwndbg
+    cp -r *.py pwndbg gdb-pt-dump $out/share/pwndbg
     chmod +x $out/share/pwndbg/gdbinit.py
     makeWrapper ${gdb}/bin/gdb $out/bin/pwndbg \
       --add-flags "-q -x $out/share/pwndbg/gdbinit.py" \
+      --prefix PATH : ${binPath} \
       --set NIX_PYTHONPATH ${pythonPath}
   '';
 
@@ -48,8 +55,8 @@ in stdenv.mkDerivation rec {
     homepage = "https://github.com/pwndbg/pwndbg";
     license = licenses.mit;
     platforms = platforms.all;
-    maintainers = with maintainers; [ mic92 ];
-    # never built on aarch64-darwin since first introduction in nixpkgs
+    maintainers = with maintainers; [ mic92 patryk4815 ];
+    # not supported on aarch64-darwin see: https://inbox.sourceware.org/gdb/3185c3b8-8a91-4beb-a5d5-9db6afb93713@Spark/
     broken = stdenv.isDarwin && stdenv.isAarch64;
   };
 }

From b720d8a06f5714dbc284944703d2f93678ccec7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <Mic92@users.noreply.github.com>
Date: Sun, 15 Jan 2023 23:09:14 +0000
Subject: [PATCH 2/2] Update pkgs/development/tools/misc/pwndbg/default.nix

---
 pkgs/development/tools/misc/pwndbg/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/misc/pwndbg/default.nix b/pkgs/development/tools/misc/pwndbg/default.nix
index ff94a8e3183a..d80fa230c8a4 100644
--- a/pkgs/development/tools/misc/pwndbg/default.nix
+++ b/pkgs/development/tools/misc/pwndbg/default.nix
@@ -22,7 +22,7 @@ let
     python3.pkgs.pwntools   # ref: https://github.com/pwndbg/pwndbg/blob/2022.12.19/pwndbg/wrappers/checksec.py#L8
   ] ++ lib.optionals stdenv.isLinux [
     python3.pkgs.ropper     # ref: https://github.com/pwndbg/pwndbg/blob/2022.12.19/pwndbg/commands/ropper.py#L30
-    python3.pkgs.ROPGadget  # ref: https://github.com/pwndbg/pwndbg/blob/2022.12.19/pwndbg/commands/rop.py#L32
+    python3.pkgs.ropgadget  # ref: https://github.com/pwndbg/pwndbg/blob/2022.12.19/pwndbg/commands/rop.py#L32
   ]);
 
 in stdenv.mkDerivation rec {