diff --git a/flake.nix b/flake.nix index b1256c5..64501f5 100644 --- a/flake.nix +++ b/flake.nix @@ -61,12 +61,11 @@ cleanSrc = craneLib.cleanCargoSource ../.; - staticPkgs = pkgs.pkgsStatic; commonArgs = { inherit src cleanSrc; - stdenv = pkgs.stdenvAdapters.useMoldLinker pkgs.stdenv; + #stdenv = pkgs.stdenvAdapters.useMoldLinker pkgs.stdenv; strictDeps = true; cargoArtifacts = craneLib.buildDepsOnly commonArgs; @@ -74,16 +73,16 @@ pkg-config ]; - BuildInputs = with staticPkgs; [ + BuildInputs = with pkgs; [ openssl ]; CARGO_BUILD_TARGET = "x86_64-unknown-linux-gnu"; CARGO_BUILD_RUSTFLAGS = "-C target-feature=+crt-static"; OPENSSL_STATIC = "true"; - OPENSSL_DIR = "${staticPkgs.openssl.dev}"; - OPENSSL_LIB_DIR = "${staticPkgs.openssl.out}/lib"; - OPENSSL_INCLUDE_DIR = "${staticPkgs.openssl.dev}/include/"; + OPENSSL_DIR = "${pkgs.openssl.dev}"; + OPENSSL_LIB_DIR = "${pkgs.openssl.out}/lib"; + OPENSSL_INCLUDE_DIR = "${pkgs.openssl.dev}/include/"; }; buildCrate = @@ -182,6 +181,7 @@ cargo-machete cargo-nextest cargo-watch + glibc.static hyperfine just nixfmt-rfc-style