diff options
author | Graham Christensen <graham@grahamc.com> | 2020-12-29 14:31:39 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-29 14:31:39 -0500 |
commit | 09b571cfe79cb6af393a022a7659ce2bcc6e02bc (patch) | |
tree | 73aefcdcb4c4ea55c332fe4a8009072517461c1a | |
parent | 15614fbe39bb91ac2437f3afec02993ed0a4c867 (diff) | |
parent | a847120875f393d0d7c7c027d1b9e674bdcfa438 (diff) | |
download | nixpkgs-09b571cfe79cb6af393a022a7659ce2bcc6e02bc.tar nixpkgs-09b571cfe79cb6af393a022a7659ce2bcc6e02bc.tar.gz nixpkgs-09b571cfe79cb6af393a022a7659ce2bcc6e02bc.tar.bz2 nixpkgs-09b571cfe79cb6af393a022a7659ce2bcc6e02bc.tar.lz nixpkgs-09b571cfe79cb6af393a022a7659ce2bcc6e02bc.tar.xz nixpkgs-09b571cfe79cb6af393a022a7659ce2bcc6e02bc.tar.zst nixpkgs-09b571cfe79cb6af393a022a7659ce2bcc6e02bc.zip |
Merge pull request #107443 from nima2007/zchunk_work
zchunk: 1.1.6-> 1.1.8 & Add darwin support
-rw-r--r-- | pkgs/development/libraries/zchunk/default.nix | 18 |
1 files 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"; |