From 5fcd336356330972d75db5df94b42b0f4ca6bffe Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 4 Aug 2024 11:40:51 +0200 Subject: [PATCH] gnutar: disable acl and attr when unavailable Fixes building for microblaze. --- pkgs/tools/archivers/gnutar/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix index 98f0b54e73fc..723c6b75ca9f 100644 --- a/pkgs/tools/archivers/gnutar/default.nix +++ b/pkgs/tools/archivers/gnutar/default.nix @@ -1,4 +1,7 @@ -{ lib, stdenv, fetchurl, autoreconfHook, updateAutotoolsGnuConfigScriptsHook, acl, libintl }: +{ lib, stdenv, fetchurl, autoreconfHook, updateAutotoolsGnuConfigScriptsHook +, libintl +, aclSupport ? lib.meta.availableOn stdenv.hostPlatform acl, acl +}: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or @@ -37,7 +40,7 @@ stdenv.mkDerivation rec { # "_libintl_textdomain", referenced from: # _main in tar.o # ld: symbol(s) not found for architecture x86_64 - buildInputs = lib.optional stdenv.isLinux acl ++ lib.optional stdenv.isDarwin libintl; + buildInputs = lib.optional aclSupport acl ++ lib.optional stdenv.isDarwin libintl; # May have some issues with root compilation because the bootstrap tool # cannot be used as a login shell for now.