Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9b4d87cec5ff
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 18a7c1df643a
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Sep 23, 2018

  1. 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.

(cherry picked from commit 104014c)
    @andrew-d @xeji
    andrew-d authored and xeji committed Sep 23, 2018
    Copy the full SHA
    18a7c1d View commit details
Showing with 17 additions and 0 deletions.
  1. +17 −0 pkgs/tools/misc/hdf4/default.nix
17 changes: 17 additions & 0 deletions pkgs/tools/misc/hdf4/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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