Merge pull request #196275 from Artturin/evalfixes

binlore: fix eval after nix pr #6530
This commit is contained in:
Artturi 2022-10-16 19:52:16 +03:00 committed by GitHub
commit 4082be5aea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -45,11 +45,11 @@ let
# TODO: feeling really uninspired on the API # TODO: feeling really uninspired on the API
loreDef = { loreDef = {
# YARA rule file # YARA rule file
rules = (src + /execers.yar); rules = (src + "/execers.yar");
# output filenames; "types" of lore # output filenames; "types" of lore
types = [ "execers" "wrappers" ]; types = [ "execers" "wrappers" ];
# shell rule callbacks; see github.com/abathur/yallback # shell rule callbacks; see github.com/abathur/yallback
yallback = (src + /execers.yall); yallback = (src + "/execers.yall");
# TODO: # TODO:
# - echo for debug, can be removed at some point # - echo for debug, can be removed at some point
# - I really just wanted to put the bit after the pipe # - I really just wanted to put the bit after the pipe
@ -88,7 +88,7 @@ let
fi fi
''; '';
}; };
overrides = (src + /overrides); overrides = (src + "/overrides");
in rec { in rec {
collect = { lore ? loreDef, drvs, strip ? [ ] }: (runCommand "more-binlore" { } '' collect = { lore ? loreDef, drvs, strip ? [ ] }: (runCommand "more-binlore" { } ''