fix running and building without devshell
This commit is contained in:
parent
57eb11a695
commit
6557a3496c
1 changed files with 9 additions and 20 deletions
29
flake.nix
29
flake.nix
|
@ -14,6 +14,10 @@
|
||||||
|
|
||||||
crateName = "fractals";
|
crateName = "fractals";
|
||||||
|
|
||||||
|
packageBuildInputs = with pkgs; [
|
||||||
|
SDL2
|
||||||
|
];
|
||||||
|
|
||||||
inherit (import "${crate2nix}/tools.nix" { inherit pkgs; })
|
inherit (import "${crate2nix}/tools.nix" { inherit pkgs; })
|
||||||
generatedCargoNix;
|
generatedCargoNix;
|
||||||
|
|
||||||
|
@ -23,21 +27,8 @@
|
||||||
}) {
|
}) {
|
||||||
inherit pkgs;
|
inherit pkgs;
|
||||||
defaultCrateOverrides = pkgs.defaultCrateOverrides // {
|
defaultCrateOverrides = pkgs.defaultCrateOverrides // {
|
||||||
alsa-sys = attrs: {
|
${crateName} = attrs: {
|
||||||
nativeBuildInputs = [
|
buildInputs = packageBuildInputs;
|
||||||
pkgs.pkg-config
|
|
||||||
];
|
|
||||||
buildInputs = [
|
|
||||||
pkgs.alsa-lib.dev
|
|
||||||
];
|
|
||||||
};
|
|
||||||
libudev-sys = attrs: {
|
|
||||||
nativeBuildInputs = [
|
|
||||||
pkgs.pkg-config
|
|
||||||
];
|
|
||||||
buildInputs = [
|
|
||||||
pkgs.systemd.dev
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -51,7 +42,7 @@
|
||||||
vulkan-loader
|
vulkan-loader
|
||||||
libxkbcommon
|
libxkbcommon
|
||||||
])}"
|
])}"
|
||||||
export RUST_SRC_PATH = ${pkgs.rust.packages.stable.rustPlatform.rustLibSrc};
|
export RUST_SRC_PATH=${pkgs.rust.packages.stable.rustPlatform.rustLibSrc};
|
||||||
'';
|
'';
|
||||||
inputsFrom = builtins.attrValues self.packages.${system};
|
inputsFrom = builtins.attrValues self.packages.${system};
|
||||||
nativeBuildInputs = with pkgs; [
|
nativeBuildInputs = with pkgs; [
|
||||||
|
@ -59,11 +50,9 @@
|
||||||
rust-analyzer
|
rust-analyzer
|
||||||
clippy
|
clippy
|
||||||
pkg-config
|
pkg-config
|
||||||
alsa-lib.dev
|
|
||||||
systemd.dev
|
|
||||||
|
|
||||||
SDL2
|
|
||||||
];
|
];
|
||||||
|
|
||||||
|
buildInputs = packageBuildInputs;
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue