mirror of
https://codeberg.org/icewind/mill-scale.git
synced 2026-06-03 09:54:19 +02:00
This commit is contained in:
parent
582f15f238
commit
591ea924cf
2 changed files with 7 additions and 1 deletions
|
|
@ -10,7 +10,7 @@
|
|||
...
|
||||
}: let
|
||||
inherit (builtins) elem readFile pathExists match any;
|
||||
inherit (lib) getExe map mkDefault mkIf mkMerge mkOption warnIf optionalAttrs types optionalString genAttrs hasInfix;
|
||||
inherit (lib) getExe map mkDefault mkIf mkMerge mkOption warnIf optionalAttrs types optionalString genAttrs hasInfix optionals;
|
||||
inherit (lib.fileset) fileFilter toSource unions;
|
||||
inherit (flakelight.types) fileset function optFunctionTo;
|
||||
|
||||
|
|
@ -39,6 +39,7 @@
|
|||
LD_LIBRARY_PATH = "/run/opengl-driver/lib/:${lib.makeLibraryPath runtimeInputs}";
|
||||
};
|
||||
};
|
||||
autoTools = pkgs: optionals (elem "insta" cargoMeta.dev-dependencies) [pkgs.cargo-insta];
|
||||
in
|
||||
warnIf (! builtins ? readFileType) "Unsupported Nix version in use."
|
||||
{
|
||||
|
|
@ -367,6 +368,7 @@ in
|
|||
with pkgs;
|
||||
[rustToolchain]
|
||||
++ (config.tools pkgs)
|
||||
++ (autoTools pkgs)
|
||||
++ (buildDeps pkgs).buildInputs
|
||||
++ (buildDeps pkgs).nativeBuildInputs;
|
||||
|
||||
|
|
@ -385,6 +387,7 @@ in
|
|||
with pkgs;
|
||||
[miriRustToolchain]
|
||||
++ (config.tools pkgs)
|
||||
++ (autoTools pkgs)
|
||||
++ (buildDeps pkgs).buildInputs
|
||||
++ (buildDeps pkgs).nativeBuildInputs;
|
||||
|
||||
|
|
@ -397,6 +400,7 @@ in
|
|||
with pkgs;
|
||||
[msrvRustToolchain]
|
||||
++ (config.tools pkgs)
|
||||
++ (autoTools pkgs)
|
||||
++ (buildDeps pkgs).buildInputs
|
||||
++ (buildDeps pkgs).nativeBuildInputs;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue