diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-01-08 06:00:59 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-08 06:00:59 +0000 |
| commit | a86f7216820f169d32169ada734e8a4a8f85d46f (patch) | |
| tree | a599d8d5889afe31600029c8d3f48493cbf4ca86 /pkgs/test | |
| parent | 2984c5a0a5daaf0410d9dda725214a3e8adb984e (diff) | |
| parent | d865557a4de48604318cce11d72f4336e7da3458 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/test')
| -rw-r--r-- | pkgs/test/checkpointBuild/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/test/checkpointBuild/default.nix b/pkgs/test/checkpointBuild/default.nix index 4a59760230a6e..cdcb022086bad 100644 --- a/pkgs/test/checkpointBuild/default.nix +++ b/pkgs/test/checkpointBuild/default.nix @@ -1,9 +1,9 @@ -{ hello, checkpointBuildTools, runCommandNoCC, texinfo, stdenv, rsync }: +{ hello, checkpointBuildTools, runCommand, texinfo, stdenv, rsync }: let baseHelloArtifacts = checkpointBuildTools.prepareCheckpointBuild hello; patchedHello = hello.overrideAttrs (old: { buildInputs = [ texinfo ]; - src = runCommandNoCC "patch-hello-src" { } '' + src = runCommand "patch-hello-src" { } '' mkdir -p $out cd $out tar xf ${hello.src} --strip-components=1 @@ -24,7 +24,7 @@ let patches = [ ./hello-additionalFile.patch ]; })); - preparedHelloRemoveFileSrc = runCommandNoCC "patch-hello-src" { } '' + preparedHelloRemoveFileSrc = runCommand "patch-hello-src" { } '' mkdir -p $out cd $out tar xf ${hello.src} --strip-components=1 @@ -33,7 +33,7 @@ let patchedHelloRemoveFile = hello.overrideAttrs (old: { buildInputs = [ texinfo ]; - src = runCommandNoCC "patch-hello-src" { } '' + src = runCommand "patch-hello-src" { } '' mkdir -p $out cd $out ${rsync}/bin/rsync -cutU --chown=$USER:$USER --chmod=+w -r ${preparedHelloRemoveFileSrc}/* . |