diff options
Diffstat (limited to 'pkgs/by-name/li/libarchive/package.nix')
| -rw-r--r-- | pkgs/by-name/li/libarchive/package.nix | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/by-name/li/libarchive/package.nix b/pkgs/by-name/li/libarchive/package.nix index 09a96e829e33..8703c1a4faba 100644 --- a/pkgs/by-name/li/libarchive/package.nix +++ b/pkgs/by-name/li/libarchive/package.nix @@ -31,13 +31,13 @@ assert xarSupport -> libxml2 != null; stdenv.mkDerivation (finalAttrs: { pname = "libarchive"; - version = "3.7.4"; + version = "3.7.7"; src = fetchFromGitHub { owner = "libarchive"; repo = "libarchive"; rev = "v${finalAttrs.version}"; - hash = "sha256-czNKXHoEn1x4deNErnqp/NZfCglF1CxNoLtZ8tcl394="; + hash = "sha256-maV2+Whi4aDG1VLAYpOTxluO9I0zNiZ8fA3w7epGlDg="; }; outputs = [ "out" "lib" "dev" ]; @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { # access-time-related tests flakey on some systems "cpio/test/test_option_a.c" "cpio/test/test_option_t.c" - ] ++ lib.optionals (stdenv.isAarch64 && stdenv.isLinux) [ + ] ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) [ # only on some aarch64-linux systems? "cpio/test/test_basic.c" "cpio/test/test_format_newc.c" @@ -82,15 +82,15 @@ stdenv.mkDerivation (finalAttrs: { zlib zstd ] ++ lib.optional stdenv.hostPlatform.isUnix sharutils - ++ lib.optionals stdenv.isLinux [ acl attr e2fsprogs ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ acl attr e2fsprogs ] ++ lib.optional xarSupport libxml2; # Without this, pkg-config-based dependencies are unhappy - propagatedBuildInputs = lib.optionals stdenv.isLinux [ attr acl ]; + propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ attr acl ]; configureFlags = lib.optional (!xarSupport) "--without-xml2"; - preBuild = lib.optionalString stdenv.isCygwin '' + preBuild = lib.optionalString stdenv.hostPlatform.isCygwin '' echo "#include <windows.h>" >> config.h ''; @@ -123,6 +123,7 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.bsd3; maintainers = with maintainers; [ jcumming AndersonTorres ]; platforms = platforms.all; + inherit (acl.meta) badPlatforms; }; passthru.tests = { |