chromium: Merge the installPhase command strings

This wasn't done in 97570d30c7f to allow reusing chromiumBeta builds
(without having to perform any changes) in the meantime.

(cherry picked from commit 9ac31885527059cfc150343e576216e712408d1b)
This commit is contained in:
Michael Weiss 2021-07-25 13:53:59 +02:00
parent 81c33c7969
commit 4dbbc50b30
No known key found for this signature in database
GPG Key ID: 5BE487C4D4771D83

View File

@ -16,6 +16,7 @@ mkChromiumDerivation (base: rec {
cp -v "$buildPath/"*.so "$buildPath/"*.pak "$buildPath/"*.bin "$libExecPath/"
cp -v "$buildPath/icudtl.dat" "$libExecPath/"
cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/"
cp -v "$buildPath/crashpad_handler" "$libExecPath/"
cp -v "$buildPath/chrome" "$libExecPath/$packageName"
# Swiftshader
@ -62,9 +63,7 @@ mkChromiumDerivation (base: rec {
-e '/\[Desktop Entry\]/a\' \
-e 'StartupWMClass=chromium-browser' \
$out/share/applications/chromium-browser.desktop
'' + ''
cp -v "$buildPath/crashpad_handler" "$libExecPath/"
''; # TODO: Merge
'';
passthru = { inherit sandboxExecutableName; };