Skip to content

fix: silence stdenv.is{Linux,Darwin} deprecation warnings #379

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sshine wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: silence stdenv.is{Linux,Darwin} deprecation warnings #379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions extra/language/rust.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@ in
# some *-sys crates require additional includes
name = "CFLAGS";
# append in case it needs to be modified
eval = "\"-I $DEVSHELL_DIR/include ${lib.optionalString pkgs.stdenv.isDarwin "-iframework $DEVSHELL_DIR/Library/Frameworks"}\"";
eval = "\"-I $DEVSHELL_DIR/include ${lib.optionalString pkgs.stdenv.hostPlatform.isDarwin "-iframework $DEVSHELL_DIR/Library/Frameworks"}\"";
}
]
++ lib.optionals pkgs.stdenv.isDarwin [
++ lib.optionals pkgs.stdenv.hostPlatform.isDarwin [
{
# On darwin for example required for some *-sys crate compilation
name = "RUSTFLAGS";
Expand Down
2 changes: 1 addition & 1 deletion extra/locale.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ in
};
};
config.env =
lib.optional pkgs.stdenv.isLinux {
lib.optional pkgs.stdenv.hostPlatform.isLinux {
name = "LOCALE_ARCHIVE";
value = "${cfg.package}/lib/locale/locale-archive";
}
Expand Down
Loading