Skip to content

Commit

Permalink
Fix overlay lib and stdenv references
Browse files Browse the repository at this point in the history
  • Loading branch information
lucperkins committed May 30, 2024
1 parent 5ae75ff commit 237fd4b
Showing 1 changed file with 2 additions and 15 deletions.
17 changes: 2 additions & 15 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -75,21 +75,8 @@
"--skip cli::cmd::eject::test::versioned_flakehub_to_github"
];

cargoTestCommands = x:
let
certFile = "${final.cacert}/etc/ssl/certs/ca-bundle.crt";
in
x ++ [
''
SSL_CERT_FILE=${certFile} \
cargo test \
--release \
--jobs $NIX_BUILD_CORES
''
];

LIBCLANG_PATH = "${final.libclang.lib}/lib";
NIX_CFLAGS_COMPILE = lib.optionalString final.stdenv.isDarwin "-I${final.libcxx.dev}/include/c++/v1";
NIX_CFLAGS_COMPILE = final.lib.optionalString final.stdenv.isDarwin "-I${final.libcxx.dev}/include/c++/v1";

nativeBuildInputs = with final; [
pkg-config
Expand All @@ -100,7 +87,7 @@
buildInputs = with final; [
gcc.cc.lib
]
++ lib.optionals (stdenv.isDarwin) (with darwin.apple_sdk.frameworks; [
++ final.lib.optionals (final.stdenv.isDarwin) (with final.darwin.apple_sdk.frameworks; [
Security
]);

Expand Down

0 comments on commit 237fd4b

Please sign in to comment.