diff options
| author | Bobby Rong <rjl931189261@126.com> | 2021-12-17 16:34:06 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-17 16:34:06 +0800 |
| commit | 040d6eb51ac6357517558e343b7db8b9b5bf8d98 (patch) | |
| tree | 6c71fdcf59fc94e0fe4afeebb0d51afef56509ab /pkgs/applications/graphics | |
| parent | 94144484c2e56bf27015aa4e607eeb3344fd5b5d (diff) | |
| parent | 27b8a8df3ebf127fcc845bf5e3d0010997875b06 (diff) | |
Merge pull request #150147 from smancill/bump-hdr-plus
hdr-plus: unstable-2020-10-29 -> unstable-2021-12-10
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/hdr-plus/default.nix | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/pkgs/applications/graphics/hdr-plus/default.nix b/pkgs/applications/graphics/hdr-plus/default.nix index 0d2f19660062d..55411e92f7f95 100644 --- a/pkgs/applications/graphics/hdr-plus/default.nix +++ b/pkgs/applications/graphics/hdr-plus/default.nix @@ -1,31 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub , cmake, halide , libpng, libjpeg, libtiff, libraw }: stdenv.mkDerivation rec { - pname = "hdr-plus-unstable"; - version = "2020-10-29"; + pname = "hdr-plus"; + version = "unstable-2021-12-10"; src = fetchFromGitHub { owner = "timothybrooks"; repo = "hdr-plus"; - rev = "132bd73ccd4eaef9830124605c93f06a98607cfa"; - sha256 = "1n49ggrppf336p7n510kapzh376791bysxj3f33m3bdzksq360ps"; + rev = "0ab70564493bdbcd5aca899b5885505d0c824435"; + sha256 = "sha256-QV8bGxkwFpbNzJG4kmrWwFQxUo2XzLPnoI1e32UmM6g="; }; - patches = [ - # PR #70, fixes incompatibility with Halide 10.0.0 - (fetchpatch { - url = "https://github.com/timothybrooks/hdr-plus/pull/70/commits/077e1a476279539c72e615210762dca27984c57b.patch"; - sha256 = "1sg2l1bqs2smpfpy4flwg86fzhcc4yf7zx998v1bfhim43yyrx59"; - }) - ]; - - postPatch = '' - sed -i '2a #include <array>' src/InputSource.h - ''; - nativeBuildInputs = [ cmake ]; buildInputs = [ halide libpng libjpeg libtiff libraw ]; |