dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #58258 from teozkr/buildRustCrate-fix-include

Browse Source 
buildRustCrate: Fix `include` filter
This commit is contained in:
Vladyslav M 2019-03-25 22:32:47 +02:00 committed by GitHub
commit 7be93a4ca7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/build-support/rust/build-rust-crate/helpers.nix
View File

@ -14,9 +14,8 @@
include = includedFiles: src: builtins.filterSource (path: type: include = includedFiles: src: builtins.filterSource (path: type:
lib.lists.any (f: lib.lists.any (f:
let p = toString (src + ("/" + f)); let p = toString (src + ("/" + f));
suff = lib.strings.removePrefix p path;
in in
suff == "" || (lib.strings.hasPrefix "/" suff) p == path || (lib.strings.hasPrefix (p + "/") path)
) includedFiles ) includedFiles
) src; ) src;
exclude = excludedFiles: src: builtins.filterSource (path: type: exclude = excludedFiles: src: builtins.filterSource (path: type: