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

Fixing "include"

Browse Source
This commit is contained in:
Pierre-Étienne Meunier 2018-11-22 11:40:03 +00:00
parent f1de24feb8
commit 0e8332ca2b
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,6 +2,7 @@
{ {
kernel = stdenv.hostPlatform.parsed.kernel.name; kernel = stdenv.hostPlatform.parsed.kernel.name;
abi = stdenv.hostPlatform.parsed.abi.name; abi = stdenv.hostPlatform.parsed.abi.name;
cpu = stdenv.hostPlatform.parsed.cpu.name;
updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions); updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions);
mapFeatures = features: map (fun: fun { features = features; }); mapFeatures = features: map (fun: fun { features = features; });
mkFeatures = feat: lib.lists.foldl (features: featureName: mkFeatures = feat: lib.lists.foldl (features: featureName:
@ -12,8 +13,10 @@
) [] (builtins.attrNames feat); ) [] (builtins.attrNames feat);
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)); in let p = toString (src + ("/" + f));
(path == p) || (type == "directory" && lib.strings.hasPrefix path p) suff = lib.strings.removePrefix p path;
in
suff == "" || (lib.strings.hasPrefix "/" suff)
) includedFiles ) includedFiles
) src; ) src;
exclude = excludedFiles: src: builtins.filterSource (path: type: exclude = excludedFiles: src: builtins.filterSource (path: type: