diff options
| author | Andrew Dunham <andrew@du.nham.ca> | 2018-09-23 14:56:58 -0700 |
|---|---|---|
| committer | xeji <36407913+xeji@users.noreply.github.com> | 2018-09-23 23:56:58 +0200 |
| commit | 104014c6bad2ea682ec8e9fdbe8ab460a64a6274 (patch) | |
| tree | fecf2e9462109d9ceddea97ed2d4caabda780487 /pkgs/tools/misc/hdf4 | |
| parent | ccd2862130a4c2a5bad2b928fdb348de1e471d34 (diff) | |
| download | nixlib-104014c6bad2ea682ec8e9fdbe8ab460a64a6274.tar nixlib-104014c6bad2ea682ec8e9fdbe8ab460a64a6274.tar.gz nixlib-104014c6bad2ea682ec8e9fdbe8ab460a64a6274.tar.bz2 nixlib-104014c6bad2ea682ec8e9fdbe8ab460a64a6274.tar.lz nixlib-104014c6bad2ea682ec8e9fdbe8ab460a64a6274.tar.xz nixlib-104014c6bad2ea682ec8e9fdbe8ab460a64a6274.tar.zst nixlib-104014c6bad2ea682ec8e9fdbe8ab460a64a6274.zip | |
hdf4: fix build on aarch64-linux (#47209)
Pull in the Debian patches for AArch64 support, and a bonus patch for reproducible builds while we're at it.
Diffstat (limited to 'pkgs/tools/misc/hdf4')
| -rw-r--r-- | pkgs/tools/misc/hdf4/default.nix | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/pkgs/tools/misc/hdf4/default.nix b/pkgs/tools/misc/hdf4/default.nix index d0bbd10d1e51..ef3839f67de9 100644 --- a/pkgs/tools/misc/hdf4/default.nix +++ b/pkgs/tools/misc/hdf4/default.nix @@ -1,4 +1,5 @@ { stdenv +, fetchpatch , fetchurl , cmake , libjpeg @@ -14,6 +15,22 @@ stdenv.mkDerivation rec { sha256 = "0n29klrrbwan9307np0d9hr128dlpc4nnlf57a140080ll3jmp8l"; }; + patches = let + # The Debian patch revision to fetch from; this may differ from our package + # version, but older patches should still apply. + patchRev = "4.2.13-4"; + getPatch = name: sha256: fetchpatch { + inherit sha256; + url = "https://salsa.debian.org/debian-gis-team/hdf4/raw/debian/${patchRev}/debian/patches/${name}"; + }; + + in [ + (getPatch "64bit" "1xqk9zpch4m6ipa0f3x2cm8rwaz4p0ppp1vqglvz18j6q91p8b5y") + (getPatch "hdfi.h" "01fr9csylnvk9jd9jn9y23bvxy192s07p32pr76mm3gwhgs9h7r4") + (getPatch "hdf-4.2.10-aarch64.patch" "1hl0xw5pd9xhpq49xpwgg7c4z6vv5p19x6qayixw0myvgwj1r4zn") + (getPatch "reproducible-builds.patch" "02j639w26xkxpxx3pdhbi18ywz8w3qmjpqjb83n47gq29y4g13hc") + ]; + buildInputs = [ cmake libjpeg |