Make package dependencies overridable.
This commit is contained in:
r-vdp
parent
e11571b70c
commit
1c92494197
1 changed files with 120 additions and 92 deletions
212
flake.nix
212
flake.nix
|
|
@ -73,51 +73,72 @@
|
||||||
};
|
};
|
||||||
# TODO Pin the version for release
|
# TODO Pin the version for release
|
||||||
rust = pkgs.rust-bin.stable.latest;
|
rust = pkgs.rust-bin.stable.latest;
|
||||||
llvm = pkgs.llvmPackages_latest;
|
|
||||||
|
|
||||||
craneLib = (crane.mkLib pkgs).overrideToolchain rust.default;
|
craneLib = (crane.mkLib pkgs).overrideToolchain rust.default;
|
||||||
|
|
||||||
# Common derivation arguments used for all builds
|
# Common derivation arguments used for all builds
|
||||||
commonArgs = {
|
commonArgs = { dbus, pkg-config }: {
|
||||||
src = craneLib.cleanCargoSource ./.;
|
src = craneLib.cleanCargoSource ./.;
|
||||||
buildInputs = with pkgs; [
|
buildInputs = [
|
||||||
dbus
|
dbus
|
||||||
];
|
];
|
||||||
nativeBuildInputs = with pkgs; [
|
nativeBuildInputs = [
|
||||||
makeWrapper
|
|
||||||
pkg-config
|
pkg-config
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
# Build only the cargo dependencies
|
# Build only the cargo dependencies
|
||||||
cargoArtifacts = craneLib.buildDepsOnly (commonArgs // {
|
cargoArtifacts = { dbus, pkg-config }:
|
||||||
pname = "system-manager";
|
craneLib.buildDepsOnly ((commonArgs { inherit dbus pkg-config; }) // {
|
||||||
});
|
pname = "system-manager";
|
||||||
|
});
|
||||||
|
|
||||||
system-manager-unwrapped = craneLib.buildPackage (commonArgs // {
|
system-manager-unwrapped =
|
||||||
pname = "system-manager";
|
{ dbus
|
||||||
inherit cargoArtifacts;
|
, pkg-config
|
||||||
});
|
}:
|
||||||
|
craneLib.buildPackage ((commonArgs { inherit dbus pkg-config; }) // {
|
||||||
|
pname = "system-manager";
|
||||||
|
cargoArtifacts = cargoArtifacts { inherit dbus pkg-config; };
|
||||||
|
});
|
||||||
|
|
||||||
system-manager = pkgs.runCommand "system-manager"
|
system-manager =
|
||||||
{
|
{ dbus
|
||||||
nativeBuildInputs = [ pkgs.makeBinaryWrapper ];
|
, makeBinaryWrapper
|
||||||
}
|
, nix
|
||||||
''
|
, pkg-config
|
||||||
makeWrapper \
|
, runCommand
|
||||||
${system-manager-unwrapped}/bin/system-manager \
|
}:
|
||||||
$out/bin/system-manager \
|
let
|
||||||
--prefix PATH : ${nixpkgs.lib.makeBinPath [ pkgs.nix ]}
|
unwrapped = system-manager-unwrapped { inherit dbus pkg-config; };
|
||||||
'';
|
in
|
||||||
|
runCommand "system-manager"
|
||||||
|
{
|
||||||
|
nativeBuildInputs = [ makeBinaryWrapper ];
|
||||||
|
}
|
||||||
|
''
|
||||||
|
makeWrapper \
|
||||||
|
${unwrapped}/bin/system-manager \
|
||||||
|
$out/bin/system-manager \
|
||||||
|
--prefix PATH : ${nixpkgs.lib.makeBinPath [ nix ]}
|
||||||
|
'';
|
||||||
|
|
||||||
system-manager-clippy = craneLib.cargoClippy (commonArgs // {
|
system-manager-clippy =
|
||||||
inherit cargoArtifacts;
|
{ dbus
|
||||||
cargoClippyExtraArgs = "--all-targets -- --deny warnings";
|
, pkg-config
|
||||||
});
|
}:
|
||||||
|
craneLib.cargoClippy ((commonArgs { inherit dbus pkg-config; }) // {
|
||||||
|
cargoArtifacts = cargoArtifacts { inherit dbus pkg-config; };
|
||||||
|
cargoClippyExtraArgs = "--all-targets -- --deny warnings";
|
||||||
|
});
|
||||||
|
|
||||||
system-manager-test = craneLib.cargoTest (commonArgs // {
|
system-manager-test =
|
||||||
inherit cargoArtifacts;
|
{ dbus
|
||||||
});
|
, pkg-config
|
||||||
|
}:
|
||||||
|
craneLib.cargoTest ((commonArgs { inherit dbus pkg-config; }) // {
|
||||||
|
cargoArtifacts = cargoArtifacts { inherit dbus pkg-config; };
|
||||||
|
});
|
||||||
|
|
||||||
# treefmt-nix configuration
|
# treefmt-nix configuration
|
||||||
treefmt.config = {
|
treefmt.config = {
|
||||||
|
|
@ -137,74 +158,81 @@
|
||||||
# cannot be found.
|
# cannot be found.
|
||||||
# The wrapped version has a reference to the nix store path, so nix is
|
# The wrapped version has a reference to the nix store path, so nix is
|
||||||
# part of its runtime closure.
|
# part of its runtime closure.
|
||||||
inherit system-manager-unwrapped system-manager;
|
system-manager-unwrapped = pkgs.callPackage system-manager-unwrapped { };
|
||||||
|
system-manager = pkgs.callPackage system-manager { };
|
||||||
|
|
||||||
|
system-manager-clippy = pkgs.callPackage system-manager-clippy { };
|
||||||
|
system-manager-test = pkgs.callPackage system-manager-test { };
|
||||||
|
|
||||||
default = self.packages.${system}.system-manager;
|
default = self.packages.${system}.system-manager;
|
||||||
};
|
};
|
||||||
|
|
||||||
devShells.default = pkgs.devshell.mkShell {
|
devShells.default =
|
||||||
packages = with pkgs; [
|
let
|
||||||
llvm.clang
|
llvm = pkgs.llvmPackages_latest;
|
||||||
openssl
|
in
|
||||||
pkg-config
|
pkgs.devshell.mkShell {
|
||||||
(rust.default.override {
|
packages = with pkgs; [
|
||||||
extensions = [ "rust-src" ];
|
llvm.clang
|
||||||
})
|
pkg-config
|
||||||
(treefmt-nix.lib.mkWrapper pkgs treefmt.config)
|
(rust.default.override {
|
||||||
];
|
extensions = [ "rust-src" ];
|
||||||
env = [
|
})
|
||||||
{
|
(treefmt-nix.lib.mkWrapper pkgs treefmt.config)
|
||||||
name = "PKG_CONFIG_PATH";
|
];
|
||||||
value = pkgs.lib.makeSearchPath "lib/pkgconfig" [
|
env = [
|
||||||
pkgs.dbus.dev
|
{
|
||||||
pkgs.systemdMinimal.dev
|
name = "PKG_CONFIG_PATH";
|
||||||
];
|
value = pkgs.lib.makeSearchPath "lib/pkgconfig" [
|
||||||
}
|
pkgs.dbus.dev
|
||||||
{
|
pkgs.systemdMinimal.dev
|
||||||
name = "LIBCLANG_PATH";
|
|
||||||
value = "${llvm.libclang}/lib";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
# for rust-analyzer
|
|
||||||
name = "RUST_SRC_PATH";
|
|
||||||
value = "${rust.rust-src}";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "RUST_BACKTRACE";
|
|
||||||
value = "1";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "RUSTFLAGS";
|
|
||||||
value =
|
|
||||||
let
|
|
||||||
getLib = pkg: "${pkgs.lib.getLib pkg}/lib";
|
|
||||||
in
|
|
||||||
pkgs.lib.concatStringsSep " " [
|
|
||||||
"-L${getLib pkgs.systemdMinimal} -lsystemd"
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
name = "DEVSHELL_NO_MOTD";
|
name = "LIBCLANG_PATH";
|
||||||
value = "1";
|
value = "${llvm.libclang}/lib";
|
||||||
}
|
}
|
||||||
];
|
{
|
||||||
devshell.startup.pre-commit.text = (pre-commit-hooks.lib.${system}.run {
|
# for rust-analyzer
|
||||||
src = ./.;
|
name = "RUST_SRC_PATH";
|
||||||
hooks = {
|
value = "${rust.rust-src}";
|
||||||
check-format = {
|
}
|
||||||
enable = true;
|
{
|
||||||
entry = "treefmt --fail-on-change";
|
name = "RUST_BACKTRACE";
|
||||||
|
value = "1";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "RUSTFLAGS";
|
||||||
|
value =
|
||||||
|
let
|
||||||
|
getLib = pkg: "${pkgs.lib.getLib pkg}/lib";
|
||||||
|
in
|
||||||
|
pkgs.lib.concatStringsSep " " [
|
||||||
|
"-L${getLib pkgs.systemdMinimal} -lsystemd"
|
||||||
|
];
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "DEVSHELL_NO_MOTD";
|
||||||
|
value = "1";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
devshell.startup.pre-commit.text = (pre-commit-hooks.lib.${system}.run {
|
||||||
|
src = ./.;
|
||||||
|
hooks = {
|
||||||
|
check-format = {
|
||||||
|
enable = true;
|
||||||
|
entry = "treefmt --fail-on-change";
|
||||||
|
};
|
||||||
|
cargo-clippy = {
|
||||||
|
enable = true;
|
||||||
|
description = "Lint Rust code.";
|
||||||
|
entry = "cargo-clippy --workspace -- -D warnings";
|
||||||
|
files = "\\.rs$";
|
||||||
|
pass_filenames = false;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
cargo-clippy = {
|
}).shellHook;
|
||||||
enable = true;
|
};
|
||||||
description = "Lint Rust code.";
|
|
||||||
entry = "cargo-clippy --workspace -- -D warnings";
|
|
||||||
files = "\\.rs$";
|
|
||||||
pass_filenames = false;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}).shellHook;
|
|
||||||
};
|
|
||||||
|
|
||||||
checks =
|
checks =
|
||||||
let
|
let
|
||||||
|
|
@ -212,7 +240,7 @@
|
||||||
enableVmTests = system != flake-utils.lib.system.aarch64-linux;
|
enableVmTests = system != flake-utils.lib.system.aarch64-linux;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
inherit
|
inherit (self.packages.${system})
|
||||||
# Build the crate as part of `nix flake check` for convenience
|
# Build the crate as part of `nix flake check` for convenience
|
||||||
system-manager
|
system-manager
|
||||||
system-manager-clippy
|
system-manager-clippy
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue