From c4ba50a94a89256a5b9d0ce3b0ef21ddea26e5d3 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <lx@deuxfleurs.fr>
Date: Sun, 2 Feb 2025 21:57:21 +0100
Subject: [PATCH] fix cross-compiled builds

---
 default.nix     |  2 +-
 nix/compile.nix | 23 ++++++++++++-----------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/default.nix b/default.nix
index 59955028..6974567f 100644
--- a/default.nix
+++ b/default.nix
@@ -1,4 +1,4 @@
-{ system ? builtins.currentSystem, git_version ? "unknown", }:
+{ system ? builtins.currentSystem, git_version ? null, }:
 
 with import ./nix/common.nix;
 
diff --git a/nix/compile.nix b/nix/compile.nix
index 75156d6b..677e26c7 100644
--- a/nix/compile.nix
+++ b/nix/compile.nix
@@ -29,6 +29,11 @@ let
     "arm-unknown-linux-musleabihf" = "ARM_UNKNOWN_LINUX_MUSLEABIHF";
   };
 
+  pkgsNative = import nixpkgs {
+    inherit system;
+    overlays = [ (import rust-overlay) ];
+  };
+
   pkgs = if target != null then
     import nixpkgs {
       inherit system;
@@ -39,10 +44,7 @@ let
       overlays = [ (import rust-overlay) ];
     }
   else
-    import nixpkgs {
-      inherit system;
-      overlays = [ (import rust-overlay) ];
-    };
+    pkgsNative;
 
   inherit (pkgs) lib stdenv;
 
@@ -115,14 +117,13 @@ let
       strictDeps = true;
       cargoExtraArgs = "--locked --features ${featuresStr}";
 
-      nativeBuildInputs = with pkgs; ([
-        pkg-config
-        stdenv.cc
-        protobuf
+      nativeBuildInputs = [
+        pkgsNative.protobuf
+        pkgs.stdenv.cc
       ] ++ lib.optionals (target == null) [
-        clang
-        mold
-      ]);
+        pkgs.clang
+        pkgs.mold
+      ];
 
       CARGO_PROFILE = if release then "release" else "dev";
       CARGO_BUILD_RUSTFLAGS =