Unverified Commit 2d8ce51e authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #202793 from erdnaxe/unicorn-remove-patch

parents b82c6495 9eedb9bf

pkgs/development/libraries/unicorn/default.nix

+2 −8
Original line number Diff line number Diff line
@@ -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

pkgs/development/libraries/unicorn/tests_unit_endian_aarch64.patch

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
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