From 9ac31885527059cfc150343e576216e712408d1b Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 25 Jul 2021 13:53:59 +0200 Subject: 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. --- pkgs/applications/networking/browsers/chromium/browser.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'pkgs/applications/networking') diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index e17f8ef7534..a86a82fcb5f 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -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; }; -- cgit 1.4.1