diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/misc/hdf4')
| -rw-r--r-- | nixpkgs/pkgs/tools/misc/hdf4/darwin-aarch64.patch | 11 | ||||
| -rw-r--r-- | nixpkgs/pkgs/tools/misc/hdf4/default.nix | 1 |
2 files changed, 12 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/tools/misc/hdf4/darwin-aarch64.patch b/nixpkgs/pkgs/tools/misc/hdf4/darwin-aarch64.patch new file mode 100644 index 000000000000..cff81e581176 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/hdf4/darwin-aarch64.patch @@ -0,0 +1,11 @@ +--- a/hdf/src/hdfi.h 2021-06-16 16:31:31.000000000 +1200 ++++ b/hdf/src/hdfi.h 2021-06-16 16:42:26.000000000 +1200 +@@ -1343,7 +1343,7 @@ + #endif /* IA64 */ + + /* Linux AArch64 */ +-#if defined __aarch64__ ++#if defined __aarch64__ && !defined __APPLE__ + + #ifdef GOT_MACHINE + If you get an error on this line more than one machine type has been defined. diff --git a/nixpkgs/pkgs/tools/misc/hdf4/default.nix b/nixpkgs/pkgs/tools/misc/hdf4/default.nix index 5373c64d647c..99acda6b7883 100644 --- a/nixpkgs/pkgs/tools/misc/hdf4/default.nix +++ b/nixpkgs/pkgs/tools/misc/hdf4/default.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { url = "https://src.fedoraproject.org/rpms/hdf/raw/edbe5f49646b609f5bc9aeeee5a2be47e9556e8c/f/hdf-aarch64.patch"; sha256 = "112svcsilk16ybbsi8ywnxfl2p1v44zh3rfn4ijnl8z08vfqrvvs"; }) + ./darwin-aarch64.patch ]; nativeBuildInputs = [ |