forked from auxolotl/templates
feat(rust): replace nix-filter with lib.fileset
This commit is contained in:
parent
38f8e550cf
commit
8142658f81
|
@ -11,10 +11,6 @@
|
|||
url = "github:nix-community/fenix";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
nix-filter = {
|
||||
url = "github:numtide/nix-filter";
|
||||
};
|
||||
};
|
||||
|
||||
outputs =
|
||||
|
@ -22,7 +18,6 @@
|
|||
self,
|
||||
nixpkgs,
|
||||
fenix,
|
||||
nix-filter,
|
||||
...
|
||||
}@inputs:
|
||||
let
|
||||
|
@ -70,7 +65,6 @@
|
|||
pkgsCross.callPackage (./. + "/nix/packages/${packageName}.nix") {
|
||||
inherit cargoMeta;
|
||||
flake-self = self;
|
||||
nix-filter = import inputs.nix-filter;
|
||||
rustPlatform = pkgsCross.makeRustPlatform {
|
||||
cargo = toolchain;
|
||||
rustc = toolchain;
|
||||
|
@ -104,7 +98,6 @@
|
|||
${packageName} = pkgs.callPackage (./. + "/nix/packages/${packageName}.nix") {
|
||||
inherit cargoMeta;
|
||||
flake-self = self;
|
||||
nix-filter = import inputs.nix-filter;
|
||||
rustPlatform = pkgs.makeRustPlatform {
|
||||
cargo = fenix-channel.toolchain;
|
||||
rustc = fenix-channel.toolchain;
|
||||
|
|
|
@ -2,21 +2,23 @@
|
|||
lib,
|
||||
flake-self,
|
||||
cargoMeta,
|
||||
nix-filter,
|
||||
rustPlatform,
|
||||
}:
|
||||
|
||||
let
|
||||
fs = lib.fileset;
|
||||
sourceFiles = fs.unions [
|
||||
(fs.maybeMissing ../../src)
|
||||
(fs.maybeMissing ../../Cargo.toml)
|
||||
(fs.maybeMissing ../../Cargo.lock)
|
||||
];
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
inherit (cargoMeta.package) version;
|
||||
pname = cargoMeta.package.name;
|
||||
|
||||
src = nix-filter {
|
||||
src = fs.toSource {
|
||||
root = ../../.;
|
||||
include = [
|
||||
"src"
|
||||
"Cargo.toml"
|
||||
"Cargo.lock"
|
||||
];
|
||||
fileset = sourceFiles;
|
||||
};
|
||||
|
||||
cargoLock.lockFile = ../../Cargo.lock;
|
||||
|
|
Loading…
Reference in a new issue