pyrox.dev
Merge pull request #195793 from hercules-ci/hercules-ci-cross
hercules-ci: Fix cross
authored by Robert Hensing and committed by GitHub cb0c860e ba3860a1
+2
-2
pkgs/development/tools/continuous-integration/hci/default.nix
+2
-2
pkgs/development/tools/continuous-integration/hci/default.nix
···
1
{ haskell, haskellPackages, lib, makeWrapper, runc, stdenv }:
2
let
3
-
inherit (haskell.lib.compose) overrideCabal addBuildDepends justStaticExecutables;
4
inherit (lib) makeBinPath;
5
bundledBins = lib.optional stdenv.isLinux runc;
6
···
15
makeWrapper $out/libexec/hci $out/bin/hci --prefix PATH : ${lib.escapeShellArg (makeBinPath bundledBins)}
16
'';
17
})
18
-
(addBuildDepends [ makeWrapper ] (justStaticExecutables haskellPackages.hercules-ci-cli));
19
in pkg // {
20
meta = pkg.meta // {
21
position = toString ./default.nix + ":1";
···
1
{ haskell, haskellPackages, lib, makeWrapper, runc, stdenv }:
2
let
3
+
inherit (haskell.lib.compose) overrideCabal addBuildTools justStaticExecutables;
4
inherit (lib) makeBinPath;
5
bundledBins = lib.optional stdenv.isLinux runc;
6
···
15
makeWrapper $out/libexec/hci $out/bin/hci --prefix PATH : ${lib.escapeShellArg (makeBinPath bundledBins)}
16
'';
17
})
18
+
(addBuildTools [ makeWrapper ] (justStaticExecutables haskellPackages.hercules-ci-cli));
19
in pkg // {
20
meta = pkg.meta // {
21
position = toString ./default.nix + ":1";
+2
-2
pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix
+2
-2
pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix
···
1
{ gnutar, gzip, git, haskell, haskellPackages, lib, makeWrapper, nixos, runc, stdenv }:
2
let
3
-
inherit (haskell.lib.compose) overrideCabal addBuildDepends justStaticExecutables;
4
inherit (lib) makeBinPath;
5
bundledBins = [ gnutar gzip git ] ++ lib.optional stdenv.isLinux runc;
6
···
15
makeWrapper $out/libexec/hercules-ci-agent $out/bin/hercules-ci-agent --prefix PATH : ${lib.escapeShellArg (makeBinPath bundledBins)}
16
'';
17
})
18
-
(addBuildDepends [ makeWrapper ] (justStaticExecutables haskellPackages.hercules-ci-agent));
19
in pkg.overrideAttrs (o: {
20
meta = o.meta // {
21
position = toString ./default.nix + ":1";
···
1
{ gnutar, gzip, git, haskell, haskellPackages, lib, makeWrapper, nixos, runc, stdenv }:
2
let
3
+
inherit (haskell.lib.compose) overrideCabal addBuildTools justStaticExecutables;
4
inherit (lib) makeBinPath;
5
bundledBins = [ gnutar gzip git ] ++ lib.optional stdenv.isLinux runc;
6
···
15
makeWrapper $out/libexec/hercules-ci-agent $out/bin/hercules-ci-agent --prefix PATH : ${lib.escapeShellArg (makeBinPath bundledBins)}
16
'';
17
})
18
+
(addBuildTools [ makeWrapper ] (justStaticExecutables haskellPackages.hercules-ci-agent));
19
in pkg.overrideAttrs (o: {
20
meta = o.meta // {
21
position = toString ./default.nix + ":1";