bump gdb-16.2 (#2765)

flake.lock

@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1736241350,
-        "narHash": "sha256-CHd7yhaDigUuJyDeX0SADbTM9FXfiWaeNyY34FL1wQU=",
+        "lastModified": 1740916017,
+        "narHash": "sha256-Ze/3XCElkVljFCnBKezLldOz2ZaGp7eozxRqFzACnMI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "8c9fd3e564728e90829ee7dbac6edc972971cd0f",
+        "rev": "b58e19b11fe72175fd7a9e014a4786a91e99da5f",
         "type": "github"
       },
       "original": {
@@ -29,11 +29,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1737338290,
-        "narHash": "sha256-gnXlfFEHA+/jMH7R+7y3JxrI3WfOjgBhzzJNuFW70UU=",
+        "lastModified": 1740362541,
+        "narHash": "sha256-S8Mno07MspggOv/xIz5g8hB2b/C5HPiX8E+rXzKY+5U=",
         "owner": "pyproject-nix",
         "repo": "build-system-pkgs",
-        "rev": "e1487e5cefda0c7990bdd2e660bee20971680e45",
+        "rev": "e151741c848ba92331af91f4e47640a1fb82be19",
         "type": "github"
       },
       "original": {
@@ -49,11 +49,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1738204167,
-        "narHash": "sha256-J5M2sj3x4ocM93shScT/3Z4XWHZhwwW1NyQK+C+8Mys=",
+        "lastModified": 1740921768,
+        "narHash": "sha256-4d27TdYoJ8B99b4kU7qESB4QVjiV9gPSuP2/MDqjDWo=",
         "owner": "pyproject-nix",
         "repo": "pyproject.nix",
-        "rev": "0d9f4b90cee1b5c5d6c142ef22de1e246e003ccc",
+        "rev": "ca5d23f044943a23cc4274b2d3dea45682dc025f",
         "type": "github"
       },
       "original": {
@@ -80,11 +80,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1738653454,
-        "narHash": "sha256-tAFX8mPZtZ+zVE/+bwPC3U+u5MxjpNP0gG24DG26jVs=",
+        "lastModified": 1740497536,
+        "narHash": "sha256-K+8wsVooqhaqyxuvew3+62mgOfRLJ7whv7woqPU3Ypo=",
         "owner": "pyproject-nix",
         "repo": "uv2nix",
-        "rev": "05b0c148bc53aebc6a906b6d0ac41dde5954cd47",
+        "rev": "d01fd3a141755ad5d5b93dd9fcbd76d6401f5bac",
         "type": "github"
       },
       "original": {

flake.nix

@@ -56,7 +56,7 @@
         "s390x" = "s390x";
         "ppc64" = "ppc64"; # broken lldb compilation ;(
         "ppc64le" = "powernv";
-        "loong64" = "loongarch64-linux"; # broken stdenv: https://github.com/NixOS/nixpkgs/issues/380901
+        "loong64" = "loongarch64-linux";
       };
       mapKeysWithName =
         formatfunc: values:
@@ -71,6 +71,15 @@
       overlayDarwin =
         final: prev:
         nixpkgs.lib.optionalAttrs prev.stdenv.isDarwin {
+          # Internally, apple-libffi uses dlopen() to load "/nix/store/<libffi-name>/lib/libffi-trampoline.dylib".
+          # However, to ensure a "portable" build, we want to avoid hardcoded /nix/store paths in binaries.
+          #
+          # This override will use the system-provided "/usr/lib/libffi-trampoline.dylib" instead of nix compiled version.
+          libffi_portable = prev.libffi.overrideAttrs (old: {
+            # https://github.com/NixOS/nixpkgs/blob/05248e665c4ce63c65bc729ef5580e02fd29675b/pkgs/os-specific/darwin/apple-source-releases/libffi/package.nix#L32
+            # Disable patching trampoline
+            postPatch = "";
+          });
           pwndbg_gdb = prev.pwndbg_gdb.override {
             # Darwin version of libiconv causes issues with our portable build
             libiconv = prev.pkgsStatic.libiconvReal;
@@ -84,6 +93,7 @@
             (final: prev: {
               pwndbg_gdb = prev.gdb;
               pwndbg_lldb = prev.lldb_19;
+              libffi_portable = null;
             })
             (
               final: prev:

nix/portable.nix

@@ -80,14 +80,19 @@ let
   skipVenv = pkgs.writeScript "pwndbg-skip-venv" "";
 
   pwndbgGdbBundled = bundler (
-    # Darwin don't have gdbserver
-    (lib.optionals (!pkgs.stdenv.isDarwin) [
-      "${lib.getBin gdb}/bin/gdbserver"
-      "exe/gdbserver"
-
-      "${wrapperBin "exe/gdbserver"}"
-      "bin/gdbserver"
+    (lib.optionals (pkgs.libffi_portable != null) [
+      "${lib.getLib pkgs.libffi_portable}/lib/"
+      "lib/"
     ])
+    ++
+      # Darwin don't have gdbserver
+      (lib.optionals (!pkgs.stdenv.isDarwin) [
+        "${lib.getBin gdb}/bin/gdbserver"
+        "exe/gdbserver"
+
+        "${wrapperBin "exe/gdbserver"}"
+        "bin/gdbserver"
+      ])
     ++ [
       "${lib.getBin gdb}/bin/gdb"
       "exe/gdb"
@@ -115,46 +120,52 @@ let
     ]
   );
 
-  pwndbgLldbBundled = bundler [
-    "${lib.getBin lldb}/bin/.lldb-wrapped"
-    "exe/lldb"
+  pwndbgLldbBundled = bundler (
+    (lib.optionals (pkgs.libffi_portable != null) [
+      "${lib.getLib pkgs.libffi_portable}/lib/"
+      "lib/"
+    ])
+    ++ [
+      "${lib.getBin lldb}/bin/.lldb-wrapped"
+      "exe/lldb"
 
-    "${lib.getBin lldb}/bin/lldb-server"
-    "exe/lldb-server"
+      "${lib.getBin lldb}/bin/lldb-server"
+      "exe/lldb-server"
 
-    "${lib.getLib lldb}/lib/"
-    "lib/"
+      "${lib.getLib lldb}/lib/"
+      "lib/"
 
-    "${pwndbgVenv}/lib/"
-    "lib/"
+      "${pwndbgVenv}/lib/"
+      "lib/"
 
-    "${python3}/lib/"
-    "lib/"
+      "${python3}/lib/"
+      "lib/"
 
-    "${python3}/bin/python3"
-    "exe/python3"
+      "${python3}/bin/python3"
+      "exe/python3"
 
-    "${pwndbg.src}/pwndbg/"
-    "lib/${python3.libPrefix}/site-packages/pwndbg/"
+      "${pwndbg.src}/pwndbg/"
+      "lib/${python3.libPrefix}/site-packages/pwndbg/"
 
-    "${pwndbg.src}/lldbinit.py"
-    "exe/lldbinit.py"
+      "${pwndbg.src}/lldbinit.py"
+      "exe/lldbinit.py"
 
-    "${pwndbg.src}/pwndbg-lldb.py"
-    "exe/pwndbg-lldb.py"
+      "${pwndbg.src}/pwndbg-lldb.py"
+      "exe/pwndbg-lldb.py"
 
-    "${skipVenv}"
-    "exe/.skip-venv"
+      "${skipVenv}"
+      "exe/.skip-venv"
 
-    "${wrapperBin "exe/lldb-server"}"
-    "bin/lldb-server"
+      "${wrapperBin "exe/lldb-server"}"
+      "bin/lldb-server"
 
-    "${wrapperBin "exe/lldb"}"
-    "bin/lldb"
+      "${wrapperBin "exe/lldb"}"
+      "bin/lldb"
 
-    "${wrapperBinPy "exe/pwndbg-lldb.py"}"
-    "bin/pwndbg-lldb"
-  ];
+      "${wrapperBinPy "exe/pwndbg-lldb.py"}"
+      "bin/pwndbg-lldb"
+    ]
+  );
   pwndbgBundled = if isLLDB then pwndbgLldbBundled else pwndbgGdbBundled;
 
   portable =

nix/pyenv.nix

@@ -12,7 +12,6 @@ let
   workspace = inputs.uv2nix.lib.workspace.loadWorkspace { workspaceRoot = "${inputs.self}"; };
 
   pyprojectOverlay = workspace.mkPyprojectOverlay {
-    # Wheel version may work, but eg. cffi is broken on macOS due to libffi colission(?) libsystem-libffi vs nixpkgs-libffi
     sourcePreference = "sdist";
   };