Hemera/nix-dylint
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use a proper toolchain name

Browse source 
Signed-off-by: Marcel Müller <neikos@neikos.email>
This commit is contained in:
Marcel Müller 2025-03-03 17:34:03 +01:00
parent 72fd03a4df
commit e62f5cce80
4 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
flake.nix
View file

@ -37,19 +37,21 @@
pkgs pkgs
; ;
}; };
drivers = pkgs.runCommandLocal "dylint-drivers" { } ''
mkdir -p $out/nightly-2025-01-09
ln -s ${lib.cargo-dylint-driver}/bin/dylint_driver-nix $out/nightly-2025-01-09/dylint-driver
'';
in in
{ {
packages = lib // { packages = lib // {
inherit craneLib; inherit craneLib drivers;
rust = rustTarget; rust = rustTarget;
drivers = pkgs.runCommandLocal "dylint-drivers" {} ''
mkdir -p $out/nightly-nix
ln -s ${lib.cargo-dylint-driver}/bin/dylint_driver-nix $out/nightly-nix/dylint-driver
'';
}; };
devShells.default = pkgs.mkShell { devShells.default = pkgs.mkShell {
RUSTUP_TOOLCHAIN = "nightly-nix"; RUSTUP_TOOLCHAIN = "nightly-2025-01-09";
DYLINT_LIBRARY_PATH = "${lib.cargo-dylint-general}/lib/";
DYLINT_DRIVER_PATH = drivers;
nativeBuildInputs = [ nativeBuildInputs = [
rustTarget rustTarget
lib.cargo-dylint lib.cargo-dylint

2
lib/cargo-dylint-driver.nix
View file

@ -13,7 +13,7 @@ let
strictDeps = true; strictDeps = true;
RUSTUP_TOOLCHAIN = "nightly-nix"; RUSTUP_TOOLCHAIN = "nightly-2025-01-09";
}; };
in in

8
lib/cargo-dylint-general.nix
View file

@ -39,9 +39,15 @@ let
preBuild = '' preBuild = ''
cd examples/general cd examples/general
mkdir -p .cargo
''; '';
RUSTUP_TOOLCHAIN = "nightly-nix";
CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER = "dylint-link";
cargoExtraArgs = "-p crate_wide_allow";
RUSTUP_TOOLCHAIN = "nightly-2025-01-09";
}; };
in in

4
lib/cargo-dylint.nix
View file

@ -30,7 +30,7 @@ let
pkg-config pkg-config
]; ];
RUSTUP_TOOLCHAIN = "nightly-nix"; RUSTUP_TOOLCHAIN = "nightly-2025-01-09";
doCheck = false; doCheck = false;
}; };
@ -52,7 +52,7 @@ craneLib.buildPackage (
--replace-fail @STABLE_CARGO@ ${craneLib.cargo}/bin/cargo --replace-fail @STABLE_CARGO@ ${craneLib.cargo}/bin/cargo
substituteInPlace internal/src/rustup.rs \ substituteInPlace internal/src/rustup.rs \
--replace-fail @RUST_TOOLCHAIN@ "nightly-nix" \ --replace-fail @RUST_TOOLCHAIN@ $RUSTUP_TOOLCHAIN \
--replace-fail @RUST_TOOLCHAIN_PATH@ ${craneLib.rustc} --replace-fail @RUST_TOOLCHAIN_PATH@ ${craneLib.rustc}
''; '';