diff options
author | Artturi <Artturin@artturin.com> | 2023-05-02 17:36:08 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-05-02 17:36:08 +0300 |
commit | 2816ca91e19b935ded8f5b563c1c187d66c9deb1 (patch) | |
tree | 90538e2cdb266a7763f93bcebd19768eb005f68b /pkgs/applications | |
parent | a246f44606e6a6dd516991efb72c7820f4268e2f (diff) | |
parent | b5a89ae93a19c1f1fcb4aaede17c0466d7c00e8b (diff) | |
download | nixlib-2816ca91e19b935ded8f5b563c1c187d66c9deb1.tar nixlib-2816ca91e19b935ded8f5b563c1c187d66c9deb1.tar.gz nixlib-2816ca91e19b935ded8f5b563c1c187d66c9deb1.tar.bz2 nixlib-2816ca91e19b935ded8f5b563c1c187d66c9deb1.tar.lz nixlib-2816ca91e19b935ded8f5b563c1c187d66c9deb1.tar.xz nixlib-2816ca91e19b935ded8f5b563c1c187d66c9deb1.tar.zst nixlib-2816ca91e19b935ded8f5b563c1c187d66c9deb1.zip |
Merge pull request #229367 from Artturin/generalchromiumimp
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/networking/browsers/chromium/common.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index d699b8c49d4b..da0172228fbf 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -331,7 +331,7 @@ let buildPhase = let buildCommand = target: '' - ninja -C "${buildPath}" -j$NIX_BUILD_CORES "${target}" + TERM=dumb ninja -C "${buildPath}" -j$NIX_BUILD_CORES "${target}" ( source chrome/installer/linux/common/installer.include PACKAGE=$packageName @@ -341,7 +341,11 @@ let ''; targets = extraAttrs.buildTargets or []; commands = map buildCommand targets; - in lib.concatStringsSep "\n" commands; + in '' + runHook preBuild + ${lib.concatStringsSep "\n" commands} + runHook postBuild + ''; postFixup = '' # Make sure that libGLESv2 and libvulkan are found by dlopen. |