diff --git a/flake.nix b/flake.nix index b4a11d8..d797a27 100644 --- a/flake.nix +++ b/flake.nix @@ -104,31 +104,12 @@ in { - inherit pkg; - - ofborg.rs = pkgs.runCommand "ofborg-rs-symlink-compat" { src = pkg; } '' - mkdir -p $out/bin - for f in $(find $src -type f); do - bn=$(basename "$f") - ln -s "$f" "$out/bin/$bn" - - # Rust 1.n? or Cargo starting outputting bins with dashes - # instead of underscores ... breaking all the callers. - if echo "$bn" | grep -q "-"; then - ln -s "$f" "$out/bin/$(echo "$bn" | tr '-' '_')" - fi - done - - test -e $out/bin/builder - test -e $out/bin/github_comment_filter - test -e $out/bin/github_comment_poster - test -e $out/bin/log_message_collector - test -e $out/bin/evaluation_filter - ''; + default = pkg; + ofborg = pkg; }); hydraJobs = { - buildRs = forAllSystems (system: self.packages.${system}.ofborg.rs); + buildRs = forAllSystems (system: self.packages.${system}.ofborg); }; }; }