Fix cross compilation of Omnia

2 files changed, 40 insertions, 0 deletions

diff --git a/pkgs/0001-configure.ac-replace-AC_CHECK_FILE.patch b/pkgs/0001-configure.ac-replace-AC_CHECK_FILE.patch
new file mode 100644
index 0000000..8b377f3
--- /dev/null
+++ b/pkgs/0001-configure.ac-replace-AC_CHECK_FILE.patch
@@ -0,0 +1,31 @@
+From 4ddfdca8416a008819d08d14d6a6f4796aef7857 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Mon, 12 Oct 2020 22:40:13 +0200
+Subject: [PATCH] configure.ac: replace AC_CHECK_FILE
+
+AC_CHECK_FILE can't be used when cross-compiling so replace it by a
+simple test -f
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0a19a2a..9773993 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -16,8 +16,8 @@ AC_PROG_CC_STDC
+ # Check for a2x only if the man page is missing, i.e. we are building from git. The release tarballs
+ # are set up to include the man pages. This way, only people creating tarballs via `make dist` and
+ # people building from git need a2x as a dependency.
+-AC_CHECK_FILE(
+-  [src/pixz.1],
++AS_IF(
++  [test -f src/pixz.1],
+   [],
+   [
+     AC_ARG_WITH(
+-- 
+2.35.1
+
diff --git a/pkgs/default.nix b/pkgs/default.nix
index ea4112a..849edff 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -38,6 +38,15 @@ let
     jemalloc = armv7lDisableCheck nixpkgs.jemalloc;
     openssh = armv7lDisableCheck nixpkgs.openssh;
     nlohmann_json = armv7lDisableCheck nixpkgs.nlohmann_json;
+    # Crosscompilation worarounds
+    btrfs-progs = nixpkgs.btrfs-progs.overrideAttrs (oldAttrs: {
+      configureFlags = ["--disable-python"];
+      installFlags = [];
+    });
+    pixz = nixpkgs.pixz.overrideAttrs (oldAttrs: {
+      configureFlags = ["--without-manpage"];
+      patches = [ ./0001-configure.ac-replace-AC_CHECK_FILE.patch ];
+    });
 
   };