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

Merge branch 'master' into staging-next

Browse Source
This commit is contained in:
Vladimír Čunát
2020-10-31 14:30:44 +01:00
parent 9c5154b5aa 680d320123
commit dfd3ede68d
837 changed files with 11282 additions and 7038 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/tools/compression/xz/default.nix
View File

@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = "https://tukaani.org/xz/";
description = "XZ, general-purpose data compression software, successor of LZMA";
description = "A general-purpose data compression software, successor of LZMA";
longDescription =
'' XZ Utils is free general-purpose data compression software with high

6
pkgs/tools/compression/zstd/default.nix
View File

@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ]
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
buildInputs = [ bash ];
buildInputs = stdenv.lib.optional stdenv.hostPlatform.isUnix bash;
patches = [
./playtests-darwin.patch
@@ -72,7 +72,9 @@ stdenv.mkDerivation rec {
--replace "zstdcat" "$bin/bin/zstdcat"
'';
outputs = [ "bin" "dev" "man" "out" ];
outputs = [ "bin" "dev" ]
++ stdenv.lib.optional stdenv.hostPlatform.isUnix "man"
++ [ "out" ];
meta = with stdenv.lib; {
description = "Zstandard real-time compression algorithm";