diff options
author | Michael Weiss <dev.primeos@gmail.com> | 2021-07-25 13:53:59 +0200 |
---|---|---|
committer | Michael Weiss <dev.primeos@gmail.com> | 2021-07-25 13:57:16 +0200 |
commit | 9ac31885527059cfc150343e576216e712408d1b (patch) | |
tree | 4a39b52a5a2d64a7b9b3c82a99de42a03bba5cd3 /pkgs/applications/networking | |
parent | 10594c9a96ac5e23f05040ea1e0789d631fdcd1f (diff) | |
download | nixpkgs-9ac31885527059cfc150343e576216e712408d1b.tar nixpkgs-9ac31885527059cfc150343e576216e712408d1b.tar.gz nixpkgs-9ac31885527059cfc150343e576216e712408d1b.tar.bz2 nixpkgs-9ac31885527059cfc150343e576216e712408d1b.tar.lz nixpkgs-9ac31885527059cfc150343e576216e712408d1b.tar.xz nixpkgs-9ac31885527059cfc150343e576216e712408d1b.tar.zst nixpkgs-9ac31885527059cfc150343e576216e712408d1b.zip |
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.
Diffstat (limited to 'pkgs/applications/networking')
-rw-r--r-- | pkgs/applications/networking/browsers/chromium/browser.nix | 5 |
1 files changed, 2 insertions, 3 deletions
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; }; |