MirrorHub/conduit
1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2024-09-28 18:18:52 +02:00
Code Issues Releases Activity

refer directly to stdenv since it's in scope

Browse source
This commit is contained in:
Charles Hall 2024-01-25 22:00:32 -08:00
parent 9453dbc740
commit a7892a28ec
No known key found for this signature in database
GPG key ID: 7B8E0645816E07CF
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
flake.nix
View file

@ -70,7 +70,7 @@
stdenv.hostPlatform.isStatic stdenv.hostPlatform.isStatic
["-C" "relocation-model=static"] ["-C" "relocation-model=static"]
++ lib.optionals ++ lib.optionals
(stdenv.buildPlatform.config != pkgs.stdenv.hostPlatform.config) (stdenv.buildPlatform.config != stdenv.hostPlatform.config)
["-l" "c"] ["-l" "c"]
++ lib.optionals ++ lib.optionals
# This check has to match the one [here][0]. We only need to set # This check has to match the one [here][0]. We only need to set
@ -79,14 +79,13 @@
# #
# [0]: https://github.com/NixOS/nixpkgs/blob/612f97239e2cc474c13c9dafa0df378058c5ad8d/pkgs/build-support/rust/lib/default.nix#L36-L39 # [0]: https://github.com/NixOS/nixpkgs/blob/612f97239e2cc474c13c9dafa0df378058c5ad8d/pkgs/build-support/rust/lib/default.nix#L36-L39
( (
(pkgs.stdenv.hostPlatform.isAarch64 # Nixpkgs doesn't check for x86_64 here but we do, because I
# Nixpkgs doesn't check for x86_64 here but we do, because I # observed a failure building statically for x86_64 without
# observed a failure building statically for x86_64 without # including it here. Linkers are weird.
# including it here. Linkers are weird. (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isx86_64)
|| pkgs.stdenv.hostPlatform.isx86_64) && stdenv.hostPlatform.isStatic
&& pkgs.stdenv.hostPlatform.isStatic && !stdenv.isDarwin
&& !pkgs.stdenv.isDarwin && !stdenv.cc.bintools.isLLVM
&& !pkgs.stdenv.cc.bintools.isLLVM
) )
[ [
"-l" "-l"