about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlexandre Iooss <erdnaxe@crans.org>2022-11-25 08:44:32 +0100
committerAlexandre Iooss <erdnaxe@crans.org>2022-11-25 08:44:32 +0100
commit9eedb9bf091203b36b154c7200bd78de4afa5f63 (patch)
tree519347b20674baa8f7590517b455c78eaf002e45
parent3265a24b79bbf1a21f0da2b67cfd71878b7eb52c (diff)
unicorn: 2.0.1 -> 2.0.1.post1
-rw-r--r--pkgs/development/libraries/unicorn/default.nix10
-rw-r--r--pkgs/development/libraries/unicorn/tests_unit_endian_aarch64.patch20
2 files changed, 2 insertions, 28 deletions
diff --git a/pkgs/development/libraries/unicorn/default.nix b/pkgs/development/libraries/unicorn/default.nix
index 88759c67e0ee5..89adbc102578f 100644
--- a/pkgs/development/libraries/unicorn/default.nix
+++ b/pkgs/development/libraries/unicorn/default.nix
@@ -9,21 +9,15 @@
 
 stdenv.mkDerivation rec {
   pname = "unicorn";
-  version = "2.0.1";
+  version = "2.0.1.post1";
 
   src = fetchFromGitHub {
     owner = "unicorn-engine";
     repo = pname;
     rev = version;
-    hash = "sha256-D8kwrHo58zksVjB13VtzoVqmz++FRfJ4zI2CT+YeBVE=";
+    hash = "sha256-Jz5C35rwnDz0CXcfcvWjkwScGNQO1uijF7JrtZhM7mI=";
   };
 
-  patches = [
-    # Fix compilation on aarch64-darwin
-    # See https://github.com/unicorn-engine/unicorn/issues/1730
-    ./tests_unit_endian_aarch64.patch
-  ];
-
   nativeBuildInputs = [
     cmake
     pkg-config
diff --git a/pkgs/development/libraries/unicorn/tests_unit_endian_aarch64.patch b/pkgs/development/libraries/unicorn/tests_unit_endian_aarch64.patch
deleted file mode 100644
index 722f4c229e7e1..0000000000000
--- a/pkgs/development/libraries/unicorn/tests_unit_endian_aarch64.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/tests/unit/endian.h b/tests/unit/endian.h
-index 5bc86308..b455899e 100644
---- a/tests/unit/endian.h
-+++ b/tests/unit/endian.h
-@@ -54,6 +54,7 @@
-    || defined(_POWER) || defined(__powerpc__) \
-    || defined(__ppc__) || defined(__hpux) || defined(__hppa) \
-    || defined(_MIPSEB) || defined(_POWER) \
-+   || defined(__ARMEB__) || defined(__AARCH64EB__) \
-    || defined(__s390__)
- # define BOOST_BIG_ENDIAN
- # define BOOST_BYTE_ORDER 4321
-@@ -63,6 +64,7 @@
-    || defined(_M_ALPHA) || defined(__amd64) \
-    || defined(__amd64__) || defined(_M_AMD64) \
-    || defined(__x86_64) || defined(__x86_64__) \
-+   || defined(__ARMEL__) || defined(__AARCH64EL__) \
-    || defined(_M_X64) || defined(__bfin__)
- 
- # define BOOST_LITTLE_ENDIAN