Build s390x binaries using musl libc

Building using musl until NixOS/nixpkgs#306473 is resolved. Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
saschagrunert · Apr 24, 2024 · 12d791e · 12d791e
1 parent 944404a
commit 12d791e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/nix/default-s390x.nix b/nix/default-s390x.nix
@@ -1,6 +1,9 @@
 (import ./nixpkgs.nix {
   crossSystem = {
-    config = "s390x-unknown-linux-gnu";
+    # TODO: Switch back to glibc when
+    # https://github.com/cri-o/cri-o/issues/7911
+    # is resolved.
+    config = "s390x-unknown-linux-musl";
   };
   overlays = [ (import ./overlay.nix) ];
 }).callPackage ./derivation.nix

diff --git a/nix/derivation.nix b/nix/derivation.nix
@@ -1,4 +1,6 @@
-{ pkgs }:
+{ stdenv
+, pkgs
+}:
 with pkgs; buildGo122Module {
   name = "cri-o";
   src = ./..;
@@ -15,9 +17,10 @@ with pkgs; buildGo122Module {
     pkg-config
     which
   ];
-  buildInputs = [
+  buildInputs = lib.optionals (!stdenv.hostPlatform.isMusl) [
     glibc
     glibc.static
+  ] ++ [
     gpgme
     libassuan
     libgpgerror