Deuxfleurs/aerogramme
15
0
Fork 1
Code Issues 33 Pull requests 1 Projects 11 Releases 5 Wiki Activity

Fix nix develop

Browse source
This commit is contained in:
Quentin 2024-02-13 10:32:11 +01:00
parent ede836fc80
commit e778bebfd3
Signed by: quentin
GPG key ID: E9602264D639FF68
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
flake.nix
View file

@ -54,21 +54,6 @@
]; ];
}; };
pkgVanilla = import nixpkgs { system = "x86_64-linux"; };
shell = pkgVanilla.mkShell {
buildInputs = [
cargo2nix.packages.x86_64-linux.default
fenix.packages.x86_64-linux.minimal.toolchain
fenix.packages.x86_64-linux.rust-analyzer
];
shellHook = ''
echo "AEROGRAME DEVELOPMENT SHELL ${fenix.packages.x86_64-linux.minimal.rustc}"
export RUST_SRC_PATH="${fenix.packages.x86_64-linux.latest.rust-src}/lib/rustlib/src/rust/library"
export RUST_ANALYZER_INTERNALS_DO_NOT_USE='this is unstable'
'';
};
rustTarget = if targetHost == "armv6l-unknown-linux-musleabihf" then "arm-unknown-linux-musleabihf" else targetHost; rustTarget = if targetHost == "armv6l-unknown-linux-musleabihf" then "arm-unknown-linux-musleabihf" else targetHost;
# release builds # release builds
@ -180,9 +165,9 @@
version = crate.version; version = crate.version;
}; };
packages = { packages = {
inherit fhs container;
debug = (rustDebug.workspace.aerogramme {}).bin; debug = (rustDebug.workspace.aerogramme {}).bin;
aerogramme = bin; aerogramme = bin;
container = container;
default = self.packages.${targetHost}.aerogramme; default = self.packages.${targetHost}.aerogramme;
}; };
}); });
@ -197,6 +182,20 @@
}; };
alba = albatros.packages.x86_64-linux.alba; alba = albatros.packages.x86_64-linux.alba;
# Shell
shell = gpkgs.mkShell {
buildInputs = [
cargo2nix.packages.x86_64-linux.default
fenix.packages.x86_64-linux.minimal.toolchain
fenix.packages.x86_64-linux.rust-analyzer
];
shellHook = ''
echo "AEROGRAME DEVELOPMENT SHELL ${fenix.packages.x86_64-linux.minimal.rustc}"
export RUST_SRC_PATH="${fenix.packages.x86_64-linux.latest.rust-src}/lib/rustlib/src/rust/library"
export RUST_ANALYZER_INTERNALS_DO_NOT_USE='this is unstable'
'';
};
# Used only to fetch the "version" # Used only to fetch the "version"
version = platformArtifacts.meta.x86_64-unknown-linux-musl.version; version = platformArtifacts.meta.x86_64-unknown-linux-musl.version;
@ -224,6 +223,7 @@
in in
{ {
devShells.x86_64-linux.default = shell;
packages = { packages = {
x86_64-linux = { x86_64-linux = {
inherit build push; inherit build push;