diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-03-19 00:41:01 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-19 00:41:01 +0000 |
| commit | d73a492e831d91dc62f97132e3e545bb9247dfc8 (patch) | |
| tree | cfbc3be5512b1fe65c5db7c880b5c83eed7cf600 /pkgs/tools/compression | |
| parent | 8497314b8eaee8b43e06c79f02e9d3ac65a94336 (diff) | |
| parent | aea8bbde8da0a9279d832f6fbd3afd916f972957 (diff) | |
| download | nixlib-d73a492e831d91dc62f97132e3e545bb9247dfc8.tar nixlib-d73a492e831d91dc62f97132e3e545bb9247dfc8.tar.gz nixlib-d73a492e831d91dc62f97132e3e545bb9247dfc8.tar.bz2 nixlib-d73a492e831d91dc62f97132e3e545bb9247dfc8.tar.lz nixlib-d73a492e831d91dc62f97132e3e545bb9247dfc8.tar.xz nixlib-d73a492e831d91dc62f97132e3e545bb9247dfc8.tar.zst nixlib-d73a492e831d91dc62f97132e3e545bb9247dfc8.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/compression')
| -rw-r--r-- | pkgs/tools/compression/dejsonlz4/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/compression/zdelta/builder.sh | 8 | ||||
| -rw-r--r-- | pkgs/tools/compression/zdelta/default.nix | 22 |
3 files changed, 17 insertions, 17 deletions
diff --git a/pkgs/tools/compression/dejsonlz4/default.nix b/pkgs/tools/compression/dejsonlz4/default.nix index 9e6f95aecb8e..07b6a5979a4f 100644 --- a/pkgs/tools/compression/dejsonlz4/default.nix +++ b/pkgs/tools/compression/dejsonlz4/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildPhase = '' - gcc -Wall -o dejsonlz4 src/dejsonlz4.c src/lz4.c + ${stdenv.cc.targetPrefix}cc -o dejsonlz4 src/dejsonlz4.c src/lz4.c ''; installPhase = '' @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/avih/dejsonlz4"; license = licenses.bsd2; maintainers = with maintainers; [ mt-caret ]; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/pkgs/tools/compression/zdelta/builder.sh b/pkgs/tools/compression/zdelta/builder.sh deleted file mode 100644 index 03db413181d7..000000000000 --- a/pkgs/tools/compression/zdelta/builder.sh +++ /dev/null @@ -1,8 +0,0 @@ -source $stdenv/setup - -installPhase() { - mkdir -p $out/bin - cp -p zdc zdu $out/bin -} - -genericBuild diff --git a/pkgs/tools/compression/zdelta/default.nix b/pkgs/tools/compression/zdelta/default.nix index 46760c913060..b30a43f33c13 100644 --- a/pkgs/tools/compression/zdelta/default.nix +++ b/pkgs/tools/compression/zdelta/default.nix @@ -1,16 +1,24 @@ -{lib, stdenv, fetchurl}: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "zdelta-2.1"; - builder = ./builder.sh; + pname = "zdelta"; + version = "2.1"; + src = fetchurl { - url = "${meta.homepage}/downloads/${name}.tar.gz"; - sha256 = "0k6y0r9kv5qiglnr2j4a0yvfynjkvm0pyv8ly28j0pr3w6rbxrh3"; + url = "https://web.archive.org/web/20160316212948/http://cis.poly.edu/zdelta/downloads/zdelta-2.1.tar.gz"; + sha256 = "sha256-WiQKWxJkINIwRBcdiuVLMDiupQ8gOsiXOEZvHDa5iFg="; }; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; + + installPhase = '' + mkdir -p $out/bin + cp -p zdc zdu $out/bin + ''; + meta = with lib; { - homepage = "http://cis.poly.edu/zdelta"; - platforms = platforms.linux; + homepage = "https://web.archive.org/web/20160316212948/http://cis.poly.edu/zdelta/"; + platforms = platforms.all; license = licenses.zlib; }; } |