From a847120875f393d0d7c7c027d1b9e674bdcfa438 Mon Sep 17 00:00:00 2001 From: Nima Vasseghi Date: Tue, 29 Dec 2020 02:00:55 -0800 Subject: zchunk: 1.1.6 -> 1.1.8 | Add darwin support Zchunk previously couldn't compile on macOS and had to be skipped for macOS on some packages. --- pkgs/development/libraries/zchunk/default.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/zchunk/default.nix b/pkgs/development/libraries/zchunk/default.nix index b7787650e7c..a0cb85ed71a 100644 --- a/pkgs/development/libraries/zchunk/default.nix +++ b/pkgs/development/libraries/zchunk/default.nix @@ -1,15 +1,17 @@ { stdenv , fetchFromGitHub +, fetchpatch , pkgconfig , meson , ninja , zstd , curl +, argp-standalone }: stdenv.mkDerivation rec { pname = "zchunk"; - version = "1.1.6"; + version = "1.1.8"; outputs = [ "out" "lib" "dev" ]; @@ -17,7 +19,7 @@ stdenv.mkDerivation rec { owner = "zchunk"; repo = pname; rev = version; - sha256 = "1j05f26xppwbkxrm11895blm75i1a6p9q23x7wlkqw198mpnpbbv"; + sha256 = "0q1jafxh5nqgn2w5ciljkh8h46xma0qia8a5rj9m0pxixcacqj6q"; }; nativeBuildInputs = [ @@ -29,7 +31,17 @@ stdenv.mkDerivation rec { buildInputs = [ zstd curl - ]; + ] ++ stdenv.lib.optional stdenv.isDarwin argp-standalone; + + # Darwin needs a patch for argp-standalone usage and differing endian.h location on macOS + # https://github.com/zchunk/zchunk/pull/35 + patches = [ + (fetchpatch { + name = "darwin-support.patch"; + url = "https://github.com/zchunk/zchunk/commit/f7db2ac0a95028a7f82ecb89862426bf53a69232.patch"; + sha256 = "0cm84gyii4ly6nsmagk15g9kbfa13rw395nqk3fdcwm0dpixlkh4"; + }) +]; meta = with stdenv.lib; { description = "File format designed for highly efficient deltas while maintaining good compression"; -- cgit 1.4.1