diff options
| author | Vladyslav M <dywedir@gra.red> | 2019-03-25 22:32:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-25 22:32:47 +0200 |
| commit | 7be93a4ca75076e4b9b15b0dea9c0c508af0b7ec (patch) | |
| tree | a22c9b40c110cb16fe49a08c3c2aace43376fa95 | |
| parent | 9e693a074d0c725f575742d7b2b7318cc7ec6dee (diff) | |
| parent | 5eec83eb83045e8baf91df5c8181594781bc8658 (diff) | |
| download | nixpkgs-7be93a4ca75076e4b9b15b0dea9c0c508af0b7ec.tar nixpkgs-7be93a4ca75076e4b9b15b0dea9c0c508af0b7ec.tar.gz nixpkgs-7be93a4ca75076e4b9b15b0dea9c0c508af0b7ec.tar.bz2 nixpkgs-7be93a4ca75076e4b9b15b0dea9c0c508af0b7ec.tar.lz nixpkgs-7be93a4ca75076e4b9b15b0dea9c0c508af0b7ec.tar.xz nixpkgs-7be93a4ca75076e4b9b15b0dea9c0c508af0b7ec.tar.zst nixpkgs-7be93a4ca75076e4b9b15b0dea9c0c508af0b7ec.zip | |
Merge pull request #58258 from teozkr/buildRustCrate-fix-include
buildRustCrate: Fix `include` filter
| -rw-r--r-- | pkgs/build-support/rust/build-rust-crate/helpers.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/build-support/rust/build-rust-crate/helpers.nix b/pkgs/build-support/rust/build-rust-crate/helpers.nix index 8a0a62434ec..14d997b2d5c 100644 --- a/pkgs/build-support/rust/build-rust-crate/helpers.nix +++ b/pkgs/build-support/rust/build-rust-crate/helpers.nix @@ -14,9 +14,8 @@ include = includedFiles: src: builtins.filterSource (path: type: lib.lists.any (f: let p = toString (src + ("/" + f)); - suff = lib.strings.removePrefix p path; in - suff == "" || (lib.strings.hasPrefix "/" suff) + p == path || (lib.strings.hasPrefix (p + "/") path) ) includedFiles ) src; exclude = excludedFiles: src: builtins.filterSource (path: type: |