Merge pull request #144855 from c0deaddict/zhf/hpe-ltfs

hpe-ltfs: fix build
This commit is contained in:
Timothy DeHerrera 2021-11-15 18:33:50 -07:00 committed by GitHub
commit 2808c51217
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 2 deletions

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, fuse, icu, pkg-config, libxml2, libuuid }:
{ lib, stdenv, fetchFromGitHub, fuse, icu66, pkg-config, libxml2, libuuid }:
stdenv.mkDerivation rec {
version = "3.4.2_Z7550-02501";
@ -13,10 +13,15 @@ stdenv.mkDerivation rec {
sourceRoot = "source/ltfs";
# include sys/sysctl.h is deprecated in glibc. The sysctl calls are only used
# for Apple to determine the kernel version. Because this build only targets
# Linux is it safe to remove.
patches = [ ./remove-sysctl.patch ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [
fuse icu libxml2 libuuid
fuse icu66 libxml2 libuuid
];
meta = with lib; {

View File

@ -0,0 +1,14 @@
diff --git a/src/libltfs/arch/arch_info.c b/src/libltfs/arch/arch_info.c
index 179428f..114acf0 100644
--- a/src/libltfs/arch/arch_info.c
+++ b/src/libltfs/arch/arch_info.c
@@ -47,9 +47,6 @@
*/
#include "libltfs/ltfs.h"
-#ifndef mingw_PLATFORM
-#include <sys/sysctl.h>
-#endif
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>