chore: instead of using crane directly use the reed/project-templates rust module
This commit is contained in:
@@ -6,130 +6,93 @@
|
||||
|
||||
flake-parts.url = "github:hercules-ci/flake-parts";
|
||||
|
||||
treefmt-nix = {
|
||||
url = "github:numtide/treefmt-nix";
|
||||
project-templates = {
|
||||
url = "git+ssh://gitea@git.krantz.one/reed/project-templates";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
inputs.flake-parts.follows = "flake-parts";
|
||||
};
|
||||
|
||||
crane.url = "github:ipetkov/crane";
|
||||
};
|
||||
|
||||
outputs = {
|
||||
self,
|
||||
flake-parts,
|
||||
treefmt-nix,
|
||||
crane,
|
||||
project-templates,
|
||||
...
|
||||
} @ inputs:
|
||||
flake-parts.lib.mkFlake {inherit inputs;} {
|
||||
imports = [
|
||||
treefmt-nix.flakeModule
|
||||
project-templates.flakeModules.rust
|
||||
];
|
||||
|
||||
systems = ["aarch64-linux" "x86_64-linux" "aarch64-darwin" "x86_64-darwin"];
|
||||
systems = ["aarch64-linux" "x86_64-linux" "aarch64-darwin"];
|
||||
|
||||
perSystem = {
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
pkgs,
|
||||
self',
|
||||
...
|
||||
}: let
|
||||
craneLib = crane.mkLib pkgs;
|
||||
src = let
|
||||
unfilteredRoot = ./.;
|
||||
in
|
||||
lib.fileset.toSource {
|
||||
root = unfilteredRoot;
|
||||
fileset = lib.fileset.unions [
|
||||
# Default files from crane (Rust and cargo files)
|
||||
(craneLib.fileset.commonCargoSources unfilteredRoot)
|
||||
(lib.fileset.maybeMissing ./qt-plugin.version)
|
||||
}: {
|
||||
krantz.rust = let
|
||||
craneLib = config.krantz.rust.craneLib;
|
||||
|
||||
# pkgs.qt6.env already includes pkgs.qt6.qtbase
|
||||
# And using `with` to prevent a lot of typing.
|
||||
qtEnv = with pkgs.qt6;
|
||||
env "qt-rshell-${qtbase.version}" [
|
||||
qtdeclarative
|
||||
qttools
|
||||
];
|
||||
};
|
||||
manifest = (lib.importTOML "${src}/Cargo.toml").package;
|
||||
in {
|
||||
enable = true;
|
||||
srcFiltered = let
|
||||
unfilteredRoot = ./.;
|
||||
in
|
||||
lib.fileset.toSource {
|
||||
root = unfilteredRoot;
|
||||
fileset = lib.fileset.unions [
|
||||
# Default files from crane (Rust and cargo files)
|
||||
(craneLib.fileset.commonCargoSources unfilteredRoot)
|
||||
(lib.fileset.maybeMissing ./qt-plugin.version)
|
||||
];
|
||||
};
|
||||
|
||||
# pkgs.qt6.env already includes pkgs.qt6.qtbase
|
||||
# And using `with` to prevent a lot of typing.
|
||||
qtEnv = with pkgs.qt6;
|
||||
env "qt-rshell-${qtbase.version}" [
|
||||
qtdeclarative
|
||||
qttools
|
||||
runtimeDeps = [
|
||||
qtEnv
|
||||
];
|
||||
|
||||
# runtime dependencies
|
||||
buildInputs = with pkgs; [
|
||||
qtEnv
|
||||
];
|
||||
|
||||
# build dependencies
|
||||
nativeBuildInputs = with pkgs; [
|
||||
# pkg-config
|
||||
# rustPlatform.bindgenHook
|
||||
];
|
||||
|
||||
# Build *just* the cargo dependencies, so we can reuse
|
||||
# all of that work (e.g. via cachix) when running in CI
|
||||
cargoArtifacts = craneLib.buildDepsOnly {
|
||||
inherit src buildInputs nativeBuildInputs;
|
||||
};
|
||||
in rec {
|
||||
# Dev Shell that lets you enter an environment with all the necessary utilites
|
||||
# Available through 'nix develop'
|
||||
# Also can be activated automatically if direnv is installed on the system with 'direnv allow'
|
||||
devShells.default = craneLib.devShell {
|
||||
inherit checks;
|
||||
|
||||
# extra tooling dependencies
|
||||
packages = with pkgs; [
|
||||
devDeps = with pkgs; [
|
||||
rust-analyzer
|
||||
quickshell
|
||||
];
|
||||
|
||||
shellHook =
|
||||
/*
|
||||
bash
|
||||
*/
|
||||
''
|
||||
export QML2_IMPORT_PATH=$(git rev-parse --show-toplevel)/result/:$QML2_IMPORT_PATH
|
||||
'';
|
||||
|
||||
inputsFrom = [packages.default];
|
||||
};
|
||||
|
||||
# Formatter for nix files, available through 'nix fmt'
|
||||
treefmt = {
|
||||
programs.alejandra.enable = true;
|
||||
programs.rustfmt = {
|
||||
enable = true;
|
||||
edition = manifest.edition;
|
||||
devShell.extraAttrs = {
|
||||
shellHook =
|
||||
/*
|
||||
bash
|
||||
*/
|
||||
''
|
||||
export QML2_IMPORT_PATH=$(git rev-parse --show-toplevel)/result/:$QML2_IMPORT_PATH
|
||||
'';
|
||||
};
|
||||
|
||||
package.name = "lib";
|
||||
};
|
||||
|
||||
# Your custom packages
|
||||
# Accessible through 'nix build', 'nix shell', 'nix run', etc
|
||||
packages = rec {
|
||||
lib = craneLib.buildPackage {
|
||||
inherit src buildInputs nativeBuildInputs cargoArtifacts;
|
||||
};
|
||||
|
||||
packages = {
|
||||
qmlModule = pkgs.runCommand "rshell-qml-dir" {} ''
|
||||
mkdir -p $out
|
||||
|
||||
cat << EOF > $out/qmldir
|
||||
${''
|
||||
module one.krantz.rshell
|
||||
plugin rshell ${lib}/lib
|
||||
plugin rshell ${self'.packages.lib}/lib
|
||||
''}
|
||||
EOF
|
||||
'';
|
||||
|
||||
default = qmlModule;
|
||||
};
|
||||
|
||||
checks = {
|
||||
clippy = craneLib.cargoClippy {
|
||||
inherit src buildInputs nativeBuildInputs cargoArtifacts;
|
||||
cargoClippyExtraArgs = "-- --deny warnings";
|
||||
};
|
||||
default = self'.packages.qmlModule;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user