diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-02-22 10:43:06 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-03-11 16:17:56 +0000 |
| commit | ca1aada113c0ebda1ab8667199f6453f8e01c4fc (patch) | |
| tree | 55e402280096f62eb0bc8bcad5ce6050c5a0aec7 /nixpkgs/pkgs/development/tools/build-managers/ninja/setup-hook.sh | |
| parent | e4df5a52a6a6531f32626f57205356a773ac2975 (diff) | |
| parent | 93883402a445ad467320925a0a5dbe43a949f25b (diff) | |
| download | nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.gz nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.bz2 nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.lz nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.xz nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.zst nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.zip | |
Merge commit '93883402a445ad467320925a0a5dbe43a949f25b'
Conflicts: nixpkgs/nixos/modules/programs/ssh.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/data/fonts/noto-fonts/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/libraries/mesa/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/tools/build-managers/ninja/setup-hook.sh')
| -rw-r--r-- | nixpkgs/pkgs/development/tools/build-managers/ninja/setup-hook.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/development/tools/build-managers/ninja/setup-hook.sh b/nixpkgs/pkgs/development/tools/build-managers/ninja/setup-hook.sh index 7d8087ad1342..015759c9d485 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/ninja/setup-hook.sh +++ b/nixpkgs/pkgs/development/tools/build-managers/ninja/setup-hook.sh @@ -14,7 +14,7 @@ ninjaBuildPhase() { ) echoCmd 'build flags' "${flagsArray[@]}" - ninja "${flagsArray[@]}" + ninja "${flagsArray[@]}" | cat runHook postBuild } @@ -33,7 +33,7 @@ ninjaInstallPhase() { ) echoCmd 'install flags' "${flagsArray[@]}" - ninja "${flagsArray[@]}" + ninja "${flagsArray[@]}" | cat runHook postInstall } @@ -67,7 +67,7 @@ ninjaCheckPhase() { ) echoCmd 'check flags' "${flagsArray[@]}" - ninja "${flagsArray[@]}" + ninja "${flagsArray[@]}" | cat fi runHook postCheck |