about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2021-01-26 01:31:34 +0100
committerGitHub <noreply@github.com>2021-01-26 01:31:34 +0100
commit4a3d942b06041719304c87b64abbf9ed24ba3d54 (patch)
treebc35b582d935709edfa19f5939f20def61ee5a11
parenteb6b3ab09f5aae747b3a49f718af3b0c6af0f9c1 (diff)
parented4a34a945ba36c26c7a45f75de897bc1973cefc (diff)
downloadnixlib-4a3d942b06041719304c87b64abbf9ed24ba3d54.tar
nixlib-4a3d942b06041719304c87b64abbf9ed24ba3d54.tar.gz
nixlib-4a3d942b06041719304c87b64abbf9ed24ba3d54.tar.bz2
nixlib-4a3d942b06041719304c87b64abbf9ed24ba3d54.tar.lz
nixlib-4a3d942b06041719304c87b64abbf9ed24ba3d54.tar.xz
nixlib-4a3d942b06041719304c87b64abbf9ed24ba3d54.tar.zst
nixlib-4a3d942b06041719304c87b64abbf9ed24ba3d54.zip
Merge pull request #110642 from jbcrail/zydis
-rw-r--r--maintainers/maintainer-list.nix6
-rw-r--r--pkgs/development/libraries/zydis/default.nix23
-rw-r--r--pkgs/top-level/all-packages.nix2
3 files changed, 31 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 30305dd21e54..e9e112fa5284 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -10514,4 +10514,10 @@
     github = "zupo";
     githubId = 311580;
   };
+  jbcrail = {
+    name = "Joseph Crail";
+    email = "jbcrail@gmail.com";
+    github = "jbcrail";
+    githubId = 6038;
+  };
 }
diff --git a/pkgs/development/libraries/zydis/default.nix b/pkgs/development/libraries/zydis/default.nix
new file mode 100644
index 000000000000..dd3f4b916314
--- /dev/null
+++ b/pkgs/development/libraries/zydis/default.nix
@@ -0,0 +1,23 @@
+{ lib, stdenv, fetchFromGitHub, cmake }:
+
+stdenv.mkDerivation rec {
+  pname = "zydis";
+  version = "3.1.0";
+
+  src = fetchFromGitHub {
+    owner = "zyantific";
+    repo = "zydis";
+    rev = "bfee99f49274a0eec3ffea16ede3a5bda9cda88f";
+    sha256 = "0x2lpc33ynd0zzirdxp2lycvg3545wh1ssgy4qlv81471iwwzv6b";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  meta = with lib; {
+    description = "Fast and lightweight x86/x86-64 disassembler library";
+    license = licenses.mit;
+    maintainers = [ maintainers.jbcrail ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4f62fff175cf..c5d8b1ff3de2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12908,6 +12908,8 @@ in
 
   ytt = callPackage ../development/tools/ytt {};
 
+  zydis = callPackage ../development/libraries/zydis { };
+
   winpdb = callPackage ../development/tools/winpdb { };
 
   grabserial = callPackage ../development/tools/grabserial { };