public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #107443 from nima2007/zchunk_work

Browse Source 
zchunk: 1.1.6-> 1.1.8 & Add darwin support
This commit is contained in:
Graham Christensen 2020-12-29 14:31:39 -05:00 committed by GitHub
commit 09b571cfe7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/libraries/zchunk/default.nix
View File

@ -1,15 +1,17 @@
{ stdenv { stdenv
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, pkgconfig , pkgconfig
, meson , meson
, ninja , ninja
, zstd , zstd
, curl , curl
, argp-standalone
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "zchunk"; pname = "zchunk";
version = "1.1.6"; version = "1.1.8";
outputs = [ "out" "lib" "dev" ]; outputs = [ "out" "lib" "dev" ];
@ -17,7 +19,7 @@ stdenv.mkDerivation rec {
owner = "zchunk"; owner = "zchunk";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1j05f26xppwbkxrm11895blm75i1a6p9q23x7wlkqw198mpnpbbv"; sha256 = "0q1jafxh5nqgn2w5ciljkh8h46xma0qia8a5rj9m0pxixcacqj6q";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -29,6 +31,16 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
zstd zstd
curl 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; { meta = with stdenv.lib; {