summary refs log tree commit diff
diff options
context:
space:
mode:
authorJörg Thalheim <joerg@thalheim.io>2021-04-11 12:25:18 +0200
committerJörg Thalheim <joerg@thalheim.io>2021-04-11 13:06:09 +0200
commit7dbe49ed1ad660ad36c35b56069ee98eb16f8955 (patch)
treed6904b5cbf244328811e1e5cba64dd01c36ca7e2
parent97cdea3f940629e8a857b8fa71cd7c4ebdb318ab (diff)
downloadnixpkgs-7dbe49ed1ad660ad36c35b56069ee98eb16f8955.tar
nixpkgs-7dbe49ed1ad660ad36c35b56069ee98eb16f8955.tar.gz
nixpkgs-7dbe49ed1ad660ad36c35b56069ee98eb16f8955.tar.bz2
nixpkgs-7dbe49ed1ad660ad36c35b56069ee98eb16f8955.tar.lz
nixpkgs-7dbe49ed1ad660ad36c35b56069ee98eb16f8955.tar.xz
nixpkgs-7dbe49ed1ad660ad36c35b56069ee98eb16f8955.tar.zst
nixpkgs-7dbe49ed1ad660ad36c35b56069ee98eb16f8955.zip
rizin: 0.1.2 -> 0.2.0
-rw-r--r--pkgs/development/tools/analysis/rizin/default.nix37
1 files changed, 25 insertions, 12 deletions
diff --git a/pkgs/development/tools/analysis/rizin/default.nix b/pkgs/development/tools/analysis/rizin/default.nix
index fdc8da7b5f8..20184ac53a1 100644
--- a/pkgs/development/tools/analysis/rizin/default.nix
+++ b/pkgs/development/tools/analysis/rizin/default.nix
@@ -18,29 +18,42 @@
 , ninja
 , capstone
 , tree-sitter
+, python3
 }:
 
 stdenv.mkDerivation rec {
   pname = "rizin";
-  version = "0.1.2";
+  version = "0.2.0";
 
   src = fetchurl {
-    url = "https://github.com/rizinorg/rizin/releases/download/v${version}/rizin-src-${version}.tar.xz";
-    sha256 = "sha256-npUp8wJiKAaQKSigXtndhJLTJ4+pyFqa0FwDLBqR/sE=";
+    url = "https://github.com/rizinorg/rizin/releases/download/v${version}/rizin-src-v${version}.tar.xz";
+    sha256 = "sha256-CGHeo247syha+rVtiAQz0XkEYK9p4DHTnLK2FhBOvE8=";
   };
 
   mesonFlags = [
-    "-Duse_sys_capstone=true"
-    "-Duse_sys_magic=true"
-    "-Duse_sys_libzip=true"
-    "-Duse_sys_zlib=true"
-    "-Duse_sys_xxhash=true"
-    "-Duse_sys_lz4=true"
-    "-Duse_sys_openssl=true"
-    "-Duse_sys_tree_sitter=true"
+    "-Duse_sys_capstone=enabled"
+    "-Duse_sys_magic=enabled"
+    "-Duse_sys_libzip=enabled"
+    "-Duse_sys_zlib=enabled"
+    "-Duse_sys_xxhash=enabled"
+    "-Duse_sys_lz4=enabled"
+    "-Duse_sys_openssl=enabled"
+    "-Duse_sys_tree_sitter=enabled"
   ];
 
-  nativeBuildInputs = [ pkg-config meson ninja cmake ];
+  nativeBuildInputs = [ pkg-config meson ninja cmake (python3.withPackages (ps: [ ps.setuptools ])) ];
+
+  # meson's find_library seems to not use our compiler wrapper if static paraemter
+  # is either true/false... We work around by also providing LIBRARY_PATH
+  preConfigure = ''
+    LIBRARY_PATH=""
+    for b in ${toString (map lib.getLib buildInputs)}; do
+      if [[ -d "$b/lib" ]]; then
+        LIBRARY_PATH="$b/lib''${LIBRARY_PATH:+:}$LIBRARY_PATH"
+      fi
+    done
+    export LIBRARY_PATH
+  '';
 
   buildInputs = [
     file