diff options
| author | Robert Hensing <roberth@users.noreply.github.com> | 2022-10-13 14:57:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-13 14:57:01 +0100 |
| commit | cb0c860e24a833381e0ece292b32728443b53ff3 (patch) | |
| tree | 892a6af9b23eb12fbaffd6f86e19a3f64a9c305e /pkgs/development/tools | |
| parent | ba3860a10f7fd74227154aeb8625e267df312f8f (diff) | |
| parent | 186294a934cfc0ab266c48b98a6c18b4c184850b (diff) | |
| download | nixpkgs-cb0c860e24a833381e0ece292b32728443b53ff3.tar nixpkgs-cb0c860e24a833381e0ece292b32728443b53ff3.tar.gz nixpkgs-cb0c860e24a833381e0ece292b32728443b53ff3.tar.bz2 nixpkgs-cb0c860e24a833381e0ece292b32728443b53ff3.tar.lz nixpkgs-cb0c860e24a833381e0ece292b32728443b53ff3.tar.xz nixpkgs-cb0c860e24a833381e0ece292b32728443b53ff3.tar.zst nixpkgs-cb0c860e24a833381e0ece292b32728443b53ff3.zip | |
Merge pull request #195793 from hercules-ci/hercules-ci-cross
hercules-ci: Fix cross
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/continuous-integration/hci/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/tools/continuous-integration/hci/default.nix b/pkgs/development/tools/continuous-integration/hci/default.nix index 0919a6ec58b..5060d0aeda0 100644 --- a/pkgs/development/tools/continuous-integration/hci/default.nix +++ b/pkgs/development/tools/continuous-integration/hci/default.nix @@ -1,6 +1,6 @@ { haskell, haskellPackages, lib, makeWrapper, runc, stdenv }: let - inherit (haskell.lib.compose) overrideCabal addBuildDepends justStaticExecutables; + inherit (haskell.lib.compose) overrideCabal addBuildTools justStaticExecutables; inherit (lib) makeBinPath; bundledBins = lib.optional stdenv.isLinux runc; @@ -15,7 +15,7 @@ let makeWrapper $out/libexec/hci $out/bin/hci --prefix PATH : ${lib.escapeShellArg (makeBinPath bundledBins)} ''; }) - (addBuildDepends [ makeWrapper ] (justStaticExecutables haskellPackages.hercules-ci-cli)); + (addBuildTools [ makeWrapper ] (justStaticExecutables haskellPackages.hercules-ci-cli)); in pkg // { meta = pkg.meta // { position = toString ./default.nix + ":1"; diff --git a/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix b/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix index ec1e6fb93b2..b4a783765df 100644 --- a/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix @@ -1,6 +1,6 @@ { gnutar, gzip, git, haskell, haskellPackages, lib, makeWrapper, nixos, runc, stdenv }: let - inherit (haskell.lib.compose) overrideCabal addBuildDepends justStaticExecutables; + inherit (haskell.lib.compose) overrideCabal addBuildTools justStaticExecutables; inherit (lib) makeBinPath; bundledBins = [ gnutar gzip git ] ++ lib.optional stdenv.isLinux runc; @@ -15,7 +15,7 @@ let makeWrapper $out/libexec/hercules-ci-agent $out/bin/hercules-ci-agent --prefix PATH : ${lib.escapeShellArg (makeBinPath bundledBins)} ''; }) - (addBuildDepends [ makeWrapper ] (justStaticExecutables haskellPackages.hercules-ci-agent)); + (addBuildTools [ makeWrapper ] (justStaticExecutables haskellPackages.hercules-ci-agent)); in pkg.overrideAttrs (o: { meta = o.meta // { position = toString ./default.nix + ":1"; |