diff options
| author | Travis A. Everett <travis.a.everett@gmail.com> | 2024-02-12 23:54:24 -0600 |
|---|---|---|
| committer | Travis A. Everett <travis.a.everett@gmail.com> | 2024-02-13 07:47:52 -0600 |
| commit | f54875f90e7e32922e1be4599feacdd31cc8833f (patch) | |
| tree | 17b7210e632e8cda10af01c04fa7c4edefe17a52 /pkgs/development/tools/analysis | |
| parent | 4c7e59780d7169f21bfb74fe8e6ee0102b5348f5 (diff) | |
| download | nixlib-f54875f90e7e32922e1be4599feacdd31cc8833f.tar nixlib-f54875f90e7e32922e1be4599feacdd31cc8833f.tar.gz nixlib-f54875f90e7e32922e1be4599feacdd31cc8833f.tar.bz2 nixlib-f54875f90e7e32922e1be4599feacdd31cc8833f.tar.lz nixlib-f54875f90e7e32922e1be4599feacdd31cc8833f.tar.xz nixlib-f54875f90e7e32922e1be4599feacdd31cc8833f.tar.zst nixlib-f54875f90e7e32922e1be4599feacdd31cc8833f.zip | |
resholve: partially fix cross-compilation
oildev has been using a pinned re2c based on what oil uses upstream. That's been a conservative choice, so I'll see if it can just lean on the normal re2c package for now.
Diffstat (limited to 'pkgs/development/tools/analysis')
| -rw-r--r-- | pkgs/development/tools/analysis/binlore/default.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/development/tools/analysis/binlore/default.nix b/pkgs/development/tools/analysis/binlore/default.nix index 54ea108b7d46..e081f43a768f 100644 --- a/pkgs/development/tools/analysis/binlore/default.nix +++ b/pkgs/development/tools/analysis/binlore/default.nix @@ -1,8 +1,7 @@ { lib , fetchFromGitHub , runCommand -, yallback -, yara +, pkgsBuildBuild }: /* TODO/CAUTION: @@ -59,7 +58,7 @@ let callback = lore: drv: overrides: '' if [[ -d "${drv}/bin" ]] || [[ -d "${drv}/lib" ]] || [[ -d "${drv}/libexec" ]]; then echo generating binlore for $drv by running: - echo "${yara}/bin/yara --scan-list --recursive ${lore.rules} <(printf '%s\n' ${drv}/{bin,lib,libexec}) | ${yallback}/bin/yallback ${lore.yallback}" + echo "${pkgsBuildBuild.yara}/bin/yara --scan-list --recursive ${lore.rules} <(printf '%s\n' ${drv}/{bin,lib,libexec}) | ${pkgsBuildBuild.yallback}/bin/yallback ${lore.yallback}" else echo "failed to generate binlore for $drv (none of ${drv}/{bin,lib,libexec} exist)" fi @@ -84,7 +83,7 @@ let ((i--)) || true # don't break build done # || true # don't break build if [[ -d "${drv}/bin" ]] || [[ -d "${drv}/lib" ]] || [[ -d "${drv}/libexec" ]]; then - ${yara}/bin/yara --scan-list --recursive ${lore.rules} <(printf '%s\n' ${drv}/{bin,lib,libexec}) | ${yallback}/bin/yallback ${lore.yallback} "$filter" + ${pkgsBuildBuild.yara}/bin/yara --scan-list --recursive ${lore.rules} <(printf '%s\n' ${drv}/{bin,lib,libexec}) | ${pkgsBuildBuild.yallback}/bin/yallback ${lore.yallback} "$filter" fi ''; }; |