diff options
| author | Timothy DeHerrera <tim.deh@pm.me> | 2021-11-15 18:33:50 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-15 18:33:50 -0700 |
| commit | 2808c512175db19c54c9054c329564f9bb7273bf (patch) | |
| tree | 0d21192de2961c4241fa2a0ffc573939f123b680 /pkgs/tools/backup | |
| parent | c7d9a9c2e163b0b48d8afdd82cfbcca1ec4fa31a (diff) | |
| parent | 4079374c60921b4b903675ad990eedc132934634 (diff) | |
Merge pull request #144855 from c0deaddict/zhf/hpe-ltfs
hpe-ltfs: fix build
Diffstat (limited to 'pkgs/tools/backup')
| -rw-r--r-- | pkgs/tools/backup/hpe-ltfs/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/tools/backup/hpe-ltfs/remove-sysctl.patch | 14 |
2 files changed, 21 insertions, 2 deletions
diff --git a/pkgs/tools/backup/hpe-ltfs/default.nix b/pkgs/tools/backup/hpe-ltfs/default.nix index ec8e6392e9cf..5ce6b287e932 100644 --- a/pkgs/tools/backup/hpe-ltfs/default.nix +++ b/pkgs/tools/backup/hpe-ltfs/default.nix @@ -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; { diff --git a/pkgs/tools/backup/hpe-ltfs/remove-sysctl.patch b/pkgs/tools/backup/hpe-ltfs/remove-sysctl.patch new file mode 100644 index 000000000000..35b56522a5bb --- /dev/null +++ b/pkgs/tools/backup/hpe-ltfs/remove-sysctl.patch @@ -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> |