Unverified Commit 213f46ec authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

Merge pull request #221214 from mweinelt/pkg-unalias 

pkg: Use xz directly, not via lzma alias
parents 968de5d5 ad43c018

pkgs/tools/package-management/pkg/default.nix

+2 −2
Original line number Diff line number Diff line 
{ 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;