1 files changed, 26 insertions, 17 deletions
diff --git a/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix b/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix
index a72ef7937c50..f88dc3f6d333 100644
--- a/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix
@@ -8,7 +8,10 @@
 , python3 ? null
 , ruby ? null
 , lua ? null
-, useX11, rubyBindings, pythonBindings, luaBindings
+, useX11 ? false
+, rubyBindings ? false
+, pythonBindings ? false
+, luaBindings ? false
 }:
 
 assert useX11 -> (gtk2 != null && vte != null && gtkdialog != null);
@@ -26,7 +29,7 @@ let
     rev,
     version,
     sha256,
-    cs_tip,
+    cs_ver,
     cs_sha256
   }:
     stdenv.mkDerivation rec {
@@ -43,15 +46,21 @@ let
           owner = "aquynh";
           repo = "capstone";
           # version from $sourceRoot/shlr/Makefile
-          rev = cs_tip;
+          rev = cs_ver;
           sha256 = cs_sha256;
         };
       in ''
-        if ! grep -F "CS_TIP=${cs_tip}" shlr/Makefile; then echo "CS_TIP mismatch"; exit 1; fi
-        # When using meson, it expects capstone source relative to build directory
         mkdir -p build/shlr
-        cp -r ${capstone} shlr/capstone
-        chmod -R +w shlr/capstone
+        cp -r ${capstone} capstone-${cs_ver}
+        chmod -R +w capstone-${cs_ver}
+        # radare 3.3 compat for radare2-cutter
+        (cd shlr && ln -s ../capstone-${cs_ver} capstone)
+        tar -czvf shlr/capstone-${cs_ver}.tar.gz capstone-${cs_ver}
+        # necessary because they broke the offline-build:
+        # https://github.com/radare/radare2/commit/6290e4ff4cc167e1f2c28ab924e9b99783fb1b38#diff-a44d840c10f1f1feaf401917ae4ccd54R258
+        # https://github.com/radare/radare2/issues/13087#issuecomment-465159716
+        curl() { true; }
+        export -f curl
       '';
 
       postInstall = ''
@@ -101,23 +110,23 @@ in {
   #<generated>
   # DO NOT EDIT! Automatically generated by ./update.py
   radare2 = generic {
-    version_commit = "20591";
-    gittap = "3.2.1";
-    gittip = "25913f4745cb3b635d52f1aafc4d8ff2aad3988a";
-    rev = "3.2.1";
-    version = "3.2.1";
-    sha256 = "1c4zj96386sc9lvfcsdh9lhyh0rvv4zzfr6218gvjkg9fy6cc91y";
-    cs_tip = "0ff8220adef16a942697afd245afc5ab0f70cbf8";
-    cs_sha256 = "1ak8ysgivq28d23r77881p0z5v65jhpap5plm10p9j3y2x00n3zn";
+    version_commit = "20942";
+    gittap = "3.3.0";
+    gittip = "5a9127d2599c8ff61d8544be7d4c9384402e94a3";
+    rev = "3.3.0";
+    version = "3.3.0";
+    sha256 = "11ap3icr8w0y49lq5dxch2h589qdmwf3qv9lsdyfsz4l0mjm49ri";
+    cs_ver = "4.0.1";
+    cs_sha256 = "0ijwxxk71nr9z91yxw20zfj4bbsbrgvixps5c7cpj163xlzlwba6";
   };
   r2-for-cutter = generic {
-    version_commit = "20591";
+    version_commit = "20942";
     gittap = "2.9.0-310-gcb62c376b";
     gittip = "cb62c376bef6c7427019a7c28910c33c364436dd";
     rev = "cb62c376bef6c7427019a7c28910c33c364436dd";
     version = "2018-10-07";
     sha256 = "0z4nr1d2ca8ibq34441j15pj22wh46brcbr00j5hcqvn8y2lh96l";
-    cs_tip = "e2c1cd46c06744beaceff42dd882de3a90f0a37c";
+    cs_ver = "e2c1cd46c06744beaceff42dd882de3a90f0a37c";
     cs_sha256 = "1czzqj8zdjgh7h2ixi26ij3mm4bgm4xw2slin6fv73nic8yaw722";
   };
   #</generated>