fix: include NIX_LDFLAGS on all systems

movementlabsxyz · Feb 21, 2024 · 58cbb8b · 58cbb8b
1 parent 95b8485
commit 58cbb8b
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/m1/flake.nix b/m1/flake.nix
@@ -62,9 +62,8 @@
               pname = subnet-cargo-toml.package.name;
               version = subnet-cargo-toml.package.version;
 
-              env = { LIBCLANG_PATH = "${libclang.lib}/lib"; }
-              // (lib.optionalAttrs (stdenv.cc.isClang && stdenv.isDarwin) { NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; });
-
+              env = { LIBCLANG_PATH = "${libclang.lib}/lib"; NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; };
+
               src = ./.;
               cargoLock = {
                 lockFile = ./Cargo.lock;
@@ -80,9 +79,9 @@
           };
 
           devShells.default = mkShell {
-            NIX_LDFLAGS="-l${stdenv.cc.libcxx.cxxabi.libName}";
             buildInputs = developmentDependencies;
             shellHook = ''
+              export NIX_LDFLAGS="-l${stdenv.cc.libcxx.cxxabi.libName}"
               export PATH=$PATH:${avalanche-network-runner}/bin
               export LIBCLANG_PATH="${pkgs.libclang.lib}/lib"
             '';