diff options
| author | Martin Weinelt <mweinelt@users.noreply.github.com> | 2023-03-14 21:38:26 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-14 21:38:26 +0000 |
| commit | 213f46ec3850d304ed149ee7c790a030aaecb559 (patch) | |
| tree | 4bb708987ce23545aec5deded2c9491afbcc9de9 /pkgs/tools/package-management | |
| parent | 968de5d563a3b93fc57ac0938470fc23b5fc68d4 (diff) | |
| parent | ad43c018d93da7621fc3552b7a158d31b16cadcc (diff) | |
| download | nixpkgs-213f46ec3850d304ed149ee7c790a030aaecb559.tar nixpkgs-213f46ec3850d304ed149ee7c790a030aaecb559.tar.gz nixpkgs-213f46ec3850d304ed149ee7c790a030aaecb559.tar.bz2 nixpkgs-213f46ec3850d304ed149ee7c790a030aaecb559.tar.lz nixpkgs-213f46ec3850d304ed149ee7c790a030aaecb559.tar.xz nixpkgs-213f46ec3850d304ed149ee7c790a030aaecb559.tar.zst nixpkgs-213f46ec3850d304ed149ee7c790a030aaecb559.zip | |
Merge pull request #221214 from mweinelt/pkg-unalias
pkg: Use xz directly, not via lzma alias
Diffstat (limited to 'pkgs/tools/package-management')
| -rw-r--r-- | pkgs/tools/package-management/pkg/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/package-management/pkg/default.nix b/pkgs/tools/package-management/pkg/default.nix index a2bac43e592..232e3e5add2 100644 --- a/pkgs/tools/package-management/pkg/default.nix +++ b/pkgs/tools/package-management/pkg/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, m4, pkg-config, tcl -, bzip2, libarchive, libbsd, lzma, openssl, zlib +, bzip2, libarchive, libbsd, xz, openssl, zlib }: stdenv.mkDerivation (finalAttrs: { @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { separateDebugInfo = true; nativeBuildInputs = [ m4 pkg-config tcl ]; - buildInputs = [ bzip2 libarchive lzma openssl zlib ] + buildInputs = [ bzip2 libarchive xz openssl zlib ] ++ lib.optional stdenv.isLinux libbsd; enableParallelBuilding = true; |