Build s390x binaries using musl libc

Building using musl until NixOS/nixpkgs#306473 is resolved. Refers to cri-o/cri-o#7911 Signed-off-by: Sascha Grunert <[email protected]>
saschagrunert · Apr 24, 2024 · 5d979b0 · 5d979b0
1 parent affab49
commit 5d979b0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 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/NixOS/nixpkgs/issues/306473
+    # 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; stdenv.mkDerivation rec {
   name = "conmon";
   src = ./..;
@@ -12,10 +14,11 @@ with pkgs; stdenv.mkDerivation rec {
     pkg-config
     which
   ];
-  buildInputs = [
-    glib
+  buildInputs = lib.optionals (!stdenv.hostPlatform.isMusl) [
     glibc
     glibc.static
+  ] ++ [
+    glib
     libseccomp
     pcre2
   ];