Merge pull request #146891 from smancill/ZHF-darwin-arj

arj: fix build on darwin

Changed files
+8 -1
pkgs
tools
archivers
top-level
+5
pkgs/tools/archivers/arj/default.nix
···
nativeBuildInputs = [ autoreconfHook ];
+
postPatch = lib.optionalString stdenv.isDarwin ''
+
substituteInPlace environ.c \
+
--replace " #include <sys/statfs.h>" " #include <sys/mount.h>"
+
'';
+
preAutoreconf = ''
cd gnu
'';
+3 -1
pkgs/top-level/all-packages.nix
···
argyllcms = callPackage ../tools/graphics/argyllcms {};
-
arj = callPackage ../tools/archivers/arj { };
+
arj = callPackage ../tools/archivers/arj {
+
stdenv = gccStdenv;
+
};
arp-scan = callPackage ../tools/misc/arp-scan { };