mirror of
https://github.com/koverstreet/bcachefs-tools.git
synced 2025-12-12 00:00:12 +03:00
refactor(nix): rm no longer needed build decls
This is now handled by crane for cross builds on its own. Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
parent
4c3f66cdaa
commit
126829decf
12
flake.nix
12
flake.nix
@ -85,7 +85,6 @@
|
|||||||
buildPackages,
|
buildPackages,
|
||||||
pkg-config,
|
pkg-config,
|
||||||
rustPlatform,
|
rustPlatform,
|
||||||
stdenv,
|
|
||||||
|
|
||||||
# run time
|
# run time
|
||||||
keyutils,
|
keyutils,
|
||||||
@ -99,8 +98,6 @@
|
|||||||
zstd,
|
zstd,
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
inherit (stdenv) cc hostPlatform;
|
|
||||||
|
|
||||||
craneLib = (crane.mkLib pkgs).overrideToolchain (
|
craneLib = (crane.mkLib pkgs).overrideToolchain (
|
||||||
p: p.rust-bin.stable."${rustVersion}".minimal.override { extensions = [ "clippy" ]; }
|
p: p.rust-bin.stable."${rustVersion}".minimal.override { extensions = [ "clippy" ]; }
|
||||||
);
|
);
|
||||||
@ -113,11 +110,6 @@
|
|||||||
env = {
|
env = {
|
||||||
PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system";
|
PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system";
|
||||||
PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev";
|
PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev";
|
||||||
|
|
||||||
CARGO_BUILD_TARGET = hostPlatform.rust.rustcTargetSpec;
|
|
||||||
"CARGO_TARGET_${hostPlatform.rust.cargoEnvVarTarget}_LINKER" = "${cc.targetPrefix}cc";
|
|
||||||
HOST_CC = "${cc.nativePrefix}cc";
|
|
||||||
TARGET_CC = "${cc.targetPrefix}cc";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
makeFlags = [
|
makeFlags = [
|
||||||
@ -128,10 +120,6 @@
|
|||||||
|
|
||||||
dontStrip = true;
|
dontStrip = true;
|
||||||
|
|
||||||
depsBuildBuild = [
|
|
||||||
buildPackages.stdenv.cc
|
|
||||||
];
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
pkg-config
|
pkg-config
|
||||||
rustPlatform.bindgenHook
|
rustPlatform.bindgenHook
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user