about summary refs log tree commit diff
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2020-04-17T11·43+0100
committerVincent Ambo <tazjin@google.com>2020-04-17T11·43+0100
commit066d34b50e1bc366b8883b2b72c95308e440460d (patch)
tree2911be8568a6126233acd7ed360bbbb27cf43485
parentb4bf0b37b0910742b4d8aabdbd54f03a371ae242 (diff)
feat(ops/nixos/nugget): Add chromium with VAAPI patches r/630
These patches enable hardware-accelerated video decoding, which is
useful for Stadia.

The main issue with this is that Hydra doesn't currently cache
Chromium with these patches, which means that it is built from scratch
which takes in the order of 5 hours on an otherwise unused nugget.
-rw-r--r--ops/nixos/nugget/default.nix4
-rw-r--r--third_party/default.nix6
2 files changed, 8 insertions, 2 deletions
diff --git a/ops/nixos/nugget/default.nix b/ops/nixos/nugget/default.nix
index 4b9e87abc27d..8f694bc94f2b 100644
--- a/ops/nixos/nugget/default.nix
+++ b/ops/nixos/nugget/default.nix
@@ -96,8 +96,9 @@ in depot.lib.fix(self: {
       lieer
       nuggetEmacs
       ops.kontemplate
-      third_party.git
+      third_party.chromiumVaapi
       third_party.ffmpeg
+      third_party.git
     ]) ++
 
     # programs from nixpkgs
@@ -105,7 +106,6 @@ in depot.lib.fix(self: {
       age
       bat
       cachix
-      chromium
       clang-manpages
       clang-tools
       clang_9
diff --git a/third_party/default.nix b/third_party/default.nix
index 87cdc5c821f2..4a9363c49f76 100644
--- a/third_party/default.nix
+++ b/third_party/default.nix
@@ -125,4 +125,10 @@ in exposed // {
 
   # Make NixOS available
   nixos = import "${nixpkgsSrc}/nixos";
+
+  # Build a Chromium with VAAPI (hardware-accelerated video decoding)
+  # enabled. This is useful for Stadia on desktop.
+  chromiumVaapi = nixpkgs.chromium.override {
+    useVaapi = true;
+  };
 }