Stop statically linking binaries when building with Nix.

nix/cargo-build.nix

@@ -1,5 +1,5 @@
 # This is a function that returns a derivation for the compiled Rust project.
-# Supports cross-compiling, and statically-links builds compiled for Linux.
+# Supports cross-compiling.
 #
 # The derivation includes some extra attributes with some of the resources that
 # were used to produce the derivation:
@@ -15,7 +15,6 @@
   # these special attributes will be given:
   #
   # - craneLib - see https://crane.dev/API.html#cranelibbuildpackage
-  # - staticallyLinked - boolean to indicate whether we are linking statically
   #
   crateExpression
 , nixpkgs
@@ -37,28 +36,13 @@ let
   buildPlatform = pkgs.stdenv.buildPlatform;
   hostPlatform = pkgs.stdenv.hostPlatform;
 
-  # We can statically-link if the cross-compilation target is Linux, and the
-  # build system is 64-bit because these are the conditions where Nix has musl
-  # packages available.
-  staticallyLinked = hostPlatform.isLinux && buildPlatform.is64bit;
-
-  # `config` is a cpu-vendor-os-abi string like "aarch64-unknown-linux-gnu". To
-  # statically link we need to change the ABI from "gnu" to "musl".
-  #
-  # Ideally we would pass in a crossSystem argument of the form
-  # "aarch64-unknown-linux-musl" instead of doing this fixup. But that doesn't
-  # seem to work.
-  buildTarget =
-    if staticallyLinked then builtins.replaceStrings [ "gnu" ] [ "musl" ] hostPlatform.config
-    else hostPlatform.config;
-
   # When possibly cross-compiling we get several versions of nixpkgs of the
   # form, `pkgs.pkgs<where it runs><platform it produces outputs for>`. We use
   # `pkgs.pkgsBuildHost` to get packages that run at build time (so run on the
   # build platform), and that produce outputs for the host platform which is the
   # cross-compilation target.
   rustToolchain = (pkgs.pkgsBuildHost.rust-bin.fromRustupToolchainFile ../rust-toolchain.toml).override {
-    targets = [ buildTarget ];
+    targets = [ hostPlatform.config ];
   };
 
   lib = pkgs.pkgsBuildHost.lib;
@@ -69,24 +53,21 @@ let
   envCase = triple: lib.strings.toUpper (builtins.replaceStrings [ "-" ] [ "_" ] triple);
 
   buildArgs = {
-    CARGO_BUILD_TARGET = buildTarget;
-    "CARGO_TARGET_${envCase buildTarget}_LINKER" = "${pkgs.stdenv.cc.targetPrefix}cc";
+    CARGO_BUILD_TARGET = hostPlatform.config;
+    "CARGO_TARGET_${envCase hostPlatform.config}_LINKER" = "${pkgs.stdenv.cc.targetPrefix}cc";
 
     # This environment variable may be necessary if any of your dependencies use
     # a build-script which invokes the `cc` crate to build some other code. The
     # `cc` crate should automatically pick up on our target-specific linker
     # above, but this may be necessary if the build script needs to compile and
     # run some extra code on the build system.
     HOST_CC = "${pkgs.stdenv.cc.nativePrefix}cc";
-  }
-  // lib.optionalAttrs staticallyLinked {
-    CARGO_BUILD_RUSTFLAGS = "-C target-feature=+crt-static";
   };
 
   # Call the given crateExpression to build the crate - or rather to get
   # a derivation that will build the crate.
   crate = pkgs.callPackage crateExpression {
-    inherit craneLib staticallyLinked binary-name;
+    inherit craneLib binary-name;
   };
 in
 # Override the derivation to add cross-compilation and static linking environment variables.

nix/ndc-agent.nix

@@ -12,7 +12,6 @@
 # https://crane.dev/API.html#cranelibbuildpackage
 #
 { craneLib
-, staticallyLinked
 , lib
 , openssl
 , libiconv
@@ -52,16 +51,6 @@ let
       pkg-config # required for non-static builds
       protobuf # required by opentelemetry-proto, a dependency of axum-tracing-opentelemetry
     ];
-
-  } // lib.optionalAttrs staticallyLinked {
-    # Configure openssl-sys for static linking. The build script for the
-    # openssl-sys crate requires openssl lib and include locations to be
-    # specified explicitly for this case.
-    #
-    # `pkgsStatic` provides versions of nixpkgs that are compiled with musl
-    OPENSSL_STATIC = "1";
-    OPENSSL_LIB_DIR = "${pkgsStatic.openssl.out}/lib";
-    OPENSSL_INCLUDE_DIR = "${pkgsStatic.openssl.dev}/include";
   };
 
   cargoArtifacts = craneLib.buildDepsOnly buildArgs;