lnav: fix cross compilation

NixOS · Dec 28, 2024 · 2c7e463 · 2c7e463
1 parent 634fd46
commit 2c7e463
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/pkgs/by-name/ln/lnav/package.nix b/pkgs/by-name/ln/lnav/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   pcre2,
   sqlite,
   ncurses,
@@ -36,13 +37,21 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
   separateDebugInfo = true;
 
+  patches = [
+    # fix cross-build of rust dependencies
+    # https://github.com/tstack/lnav/pull/1360
+    (fetchpatch {
+      url = "https://github.com/tstack/lnav/pull/1360/commits/2b0d2c402f4c11b31bd3dc804344f121dff4c08e.patch";
+      hash = "sha256-dDDc3ijEn/TbmAPxFn4bi6800cTEPoOqoXtqXq53xzo=";
+    })
+  ];
+
   strictDeps = true;
   depsBuildBuild = [ buildPackages.stdenv.cc ];
   nativeBuildInputs = [
     autoconf
     automake
     zlib
-    curl.dev
     re2c
     cargo
     rustPlatform.cargoSetupHook
@@ -76,6 +85,10 @@ stdenv.mkDerivation rec {
     ./autogen.sh
   '';
 
+  # in cross, curl-config does not work, and ./configure does not determine
+  # that it needs -lcurl
+  configureFlags = [ "LDFLAGS=-lcurl" ];
+
   passthru.updateScript = nix-update-script { };
 
   meta = with lib; {