Fix nativeBuildInputs and add cross compilation target #10

Manually merged
abonerib merged 17 commits from abonerib/bscpkgs:CIstrictDeps into master 2025-10-01 15:57:34 +02:00
2 changed files with 5 additions and 1 deletions
Showing only changes of commit 69b09b6dda - Show all commits

View File

@ -17,7 +17,7 @@
legacyPackages.${system} = pkgs;
hydraJobs = {
inherit (self.legacyPackages.${system}.bsc-ci) test pkgs;
inherit (self.legacyPackages.${system}.bsc-ci) test pkgs cross;
};
abonerib marked this conversation as resolved Outdated

@rarias do you want to add this to bsc-ci.cross also?

@rarias do you want to add this to `bsc-ci.cross` also?

It would be great to have some target that we can build by hand that includes bsc cross packages. Maybe something like this?

diff --git a/overlay.nix b/overlay.nix
index 817fd51..c981742 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -100,6 +100,9 @@ in bscPkgs // {
       final.pkgsCross.${target}.bsc-ci.pkgs
     );

+    crossList = final.runCommand "ci-cross" { }
+      "printf '%s\n' ${toString (collect isDerivation final.bsc-ci.cross.riscv64)} > $out";
+
     all = final.runCommand "ci-all" { }
     ''
       deps="${toString [ final.bsc-ci.pkgsList final.bsc-ci.tests ]}"
It would be great to have some target that we can build by hand that includes bsc cross packages. Maybe something like this? ```diff diff --git a/overlay.nix b/overlay.nix index 817fd51..c981742 100644 --- a/overlay.nix +++ b/overlay.nix @@ -100,6 +100,9 @@ in bscPkgs // { final.pkgsCross.${target}.bsc-ci.pkgs ); + crossList = final.runCommand "ci-cross" { } + "printf '%s\n' ${toString (collect isDerivation final.bsc-ci.cross.riscv64)} > $out"; + all = final.runCommand "ci-all" { } '' deps="${toString [ final.bsc-ci.pkgsList final.bsc-ci.tests ]}" ```
# propagate nixpkgs lib, so we can do bscpkgs.lib

View File

@ -96,6 +96,10 @@ in bscPkgs // {
tests = final.runCommand "ci-tests" { }
"printf '%s\n' ${toString (collect isDerivation final.bsc-ci.test)} > $out";
cross = prev.lib.genAttrs [ "riscv64" ] (target:
final.pkgsCross.${target}.bsc-ci.pkgs
);
all = final.runCommand "ci-all" { }
''
deps="${toString [ final.bsc-ci.pkgsList final.bsc-ci.tests ]}"