about summary refs log tree commit diff
path: root/pkgs/development/tools/misc
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2019-10-18 12:26:11 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2019-10-18 12:26:11 +0200
commitc51c2f79b26b188c3bd47bcddfc82a525e8b785d (patch)
tree02f699abf18256223479b82c52d80c0a9a815110 /pkgs/development/tools/misc
parentddee2072598459877b3d34fc9f910dff494538b4 (diff)
parentf702ae151685e0b29f73e71dfbf8fcdcb7d903b0 (diff)
downloadnixlib-c51c2f79b26b188c3bd47bcddfc82a525e8b785d.tar
nixlib-c51c2f79b26b188c3bd47bcddfc82a525e8b785d.tar.gz
nixlib-c51c2f79b26b188c3bd47bcddfc82a525e8b785d.tar.bz2
nixlib-c51c2f79b26b188c3bd47bcddfc82a525e8b785d.tar.lz
nixlib-c51c2f79b26b188c3bd47bcddfc82a525e8b785d.tar.xz
nixlib-c51c2f79b26b188c3bd47bcddfc82a525e8b785d.tar.zst
nixlib-c51c2f79b26b188c3bd47bcddfc82a525e8b785d.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/development/tools/misc')
-rw-r--r--pkgs/development/tools/misc/pwndbg/default.nix52
1 files changed, 21 insertions, 31 deletions
diff --git a/pkgs/development/tools/misc/pwndbg/default.nix b/pkgs/development/tools/misc/pwndbg/default.nix
index 7182144fd200..9af43e4b7471 100644
--- a/pkgs/development/tools/misc/pwndbg/default.nix
+++ b/pkgs/development/tools/misc/pwndbg/default.nix
@@ -1,33 +1,12 @@
 { stdenv
+, python3
 , fetchFromGitHub
 , makeWrapper
 , gdb
-, future
-, isort
-, psutil
-, pycparser
-, pyelftools
-, python-ptrace
-, ROPGadget
-, six
-, unicorn
-, pygments
-, }:
+}:
 
-stdenv.mkDerivation rec {
-  pname = "pwndbg";
-  version = "2019.01.25";
-
-  src = fetchFromGitHub {
-    owner = "pwndbg";
-    repo = "pwndbg";
-    rev = version;
-    sha256 = "0k7n6pcrj62ccag801yzf04a9mj9znghpkbnqwrzz0qn3rs42vgs";
-  };
-
-  nativeBuildInputs = [ makeWrapper ];
-
-  propagatedBuildInputs = [
+let
+  pythonPath = with python3.pkgs; makePythonPath [
     future
     isort
     psutil
@@ -40,16 +19,27 @@ stdenv.mkDerivation rec {
     pygments
   ];
 
+in stdenv.mkDerivation rec {
+  pname = "pwndbg";
+  version = "2019.01.25";
+  format = "other";
+
+  src = fetchFromGitHub {
+    owner = "pwndbg";
+    repo = "pwndbg";
+    rev = version;
+    sha256 = "0k7n6pcrj62ccag801yzf04a9mj9znghpkbnqwrzz0qn3rs42vgs";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
   installPhase = ''
     mkdir -p $out/share/pwndbg
     cp -r *.py pwndbg $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"
-  '';
-
-  preFixup = ''
-    sed -i "/import sys/a import sys; sys.path[0:0] = '$PYTHONPATH'.split(':')" \
-      $out/share/pwndbg/gdbinit.py
+      --add-flags "-q -x $out/share/pwndbg/gdbinit.py" \
+      --set NIX_PYTHONPATH ${pythonPath}
   '';
 
   meta = with stdenv.lib; {