8000 chore: handle deprecated stdenv.is* by adamcstephens · Pull Request #893 · nix-community/nix-init · GitHub
[go: up one dir, main page]

Skip to content
Merged
Changes from all commits
Commits
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
15 changes: 9 additions & 6 deletions src/inputs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -95,22 +95,25 @@ pub fn write_inputs(out: &mut impl Write, inputs: &Inputs, name: &'static str) -

let mut inputs = [
("", &inputs.always),
("lib.optionals stdenv.isDarwin ", &inputs.darwin),
(
"lib.optionals (stdenv.isDarwin && stdenv.isAarch64) ",
"lib.optionals stdenv.hostPlatform.isDarwin ",
&inputs.darwin,
),
(
"lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) ",
&inputs.aarch64_darwin,
),
(
"lib.optionals (stdenv.isDarwin && stdenv.isx86_64) ",
"lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) ",
&inputs.x86_64_darwin,
),
("lib.optionals stdenv.isLinux ", &inputs.linux),
("lib.optionals stdenv.hostPlatform.isLinux ", &inputs.linux),
(
"lib.optionals (stdenv.isLinux && stdenv.isAarch64) ",
"lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) ",
&inputs.aarch64_linux,
),
(
"lib.optionals (stdenv.isLinux && stdenv.isx86_64) ",
"lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64) ",
&inputs.x86_64_linux,
),
]
Expand Down
Loading
0