public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #77153 from andir/buildRustCrateHelpers-fix

Browse Source 
buildRustCrate: fixup usage of `builtins.filterSource`
This commit is contained in:
Andreas Rammhold 2020-01-07 11:41:03 +01:00 committed by GitHub
commit 2c4c7c929c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,14 +11,14 @@
else else
features features
) [] (lib.attrNames feat); ) [] (lib.attrNames feat);
include = includedFiles: src: lib.filterSource (path: type: include = includedFiles: src: builtins.filterSource (path: type:
lib.any (f: lib.any (f:
let p = toString (src + ("/" + f)); let p = toString (src + ("/" + f));
in in
p == path || (lib.strings.hasPrefix (p + "/") path) p == path || (lib.strings.hasPrefix (p + "/") path)
) includedFiles ) includedFiles
) src; ) src;
exclude = excludedFiles: src: lib.filterSource (path: type: exclude = excludedFiles: src: builtins.filterSource (path: type:
lib.all (f: lib.all (f:
!lib.strings.hasPrefix (toString (src + ("/" + f))) path !lib.strings.hasPrefix (toString (src + ("/" + f))) path
) excludedFiles ) excludedFiles