refactor(tvix): move logo to //tvix:logo r/6576

Also expose both formats, then use it from
users/tazjin/presentations/tvix-eval-2023.

Change-Id: Id906e8aff5510a7a4f33336326472e86db18ea32
Reviewed-on: https://cl.tvl.fyi/c/depot/+/9280
Tested-by: BuildkiteCI
Autosubmit: flokli <flokli@flokli.de>
Reviewed-by: tazjin <tazjin@tvl.su>

6 files changed, 14 insertions, 5 deletions

diff --git a/tvix/README.md b/tvix/README.md
index 02f3b480ba..42659336e8 100644
--- a/tvix/README.md
+++ b/tvix/README.md
@@ -1,5 +1,5 @@
 <div align="center">
-  <img src="https://tvix.dev/tvix-logo.webp">
+  <img src="https://tvix.dev/logo.webp">
 </div>
 
 -----------------
diff --git a/tvix/default.nix b/tvix/default.nix
index e36883b471..4abf27f463 100644
--- a/tvix/default.nix
+++ b/tvix/default.nix
@@ -58,6 +58,16 @@ in
     ${depot.tools.depotfmt}/bin/depotfmt Cargo.nix
   '';
 
+  # Provide the Tvix logo in both .webp and .png format.
+  logo = pkgs.runCommand "logo"
+    {
+      nativeBuildInputs = [ pkgs.imagemagick ];
+    } ''
+    mkdir -p $out
+    cp ${./logo.webp} $out/logo.webp
+    convert $out/logo.webp $out/logo.png
+  '';
+
   # Provide a shell for the combined dependencies of all Tvix Rust
   # projects. Note that as this is manually maintained it may be
   # lacking something, but it is required for some people's workflows.
diff --git a/tvix/website/tvix-logo.webp b/tvix/logo.webp
index 07bffc18b7..07bffc18b7 100644
--- a/tvix/website/tvix-logo.webp
+++ b/tvix/logo.webp
Binary files differdiff --git a/tvix/website/default.nix b/tvix/website/default.nix
index 2dd939e8a9..ed955e4d24 100644
--- a/tvix/website/default.nix
+++ b/tvix/website/default.nix
@@ -28,5 +28,5 @@ in
 pkgs.runCommand "tvix-website" { } ''
   mkdir $out
   cp ${landing} $out/index.html
-  cp ${./tvix-logo.webp} $out/tvix-logo.webp
+  cp ${depot.tvix.logo}/logo.webp $out/
 ''
diff --git a/tvix/website/landing-en.md b/tvix/website/landing-en.md
index d95320f11c..2018e67b06 100644
--- a/tvix/website/landing-en.md
+++ b/tvix/website/landing-en.md
@@ -1,4 +1,4 @@
-<img class="tvl-logo" src="./tvix-logo.webp"
+<img class="tvl-logo" src="./logo.webp"
      alt="A candy bar in different shades of blue that says 'Tvix by TVL' on it">
 
 ------------------
diff --git a/users/tazjin/presentations/tvix-eval-2023/default.nix b/users/tazjin/presentations/tvix-eval-2023/default.nix
index ce831556de..a4d855197c 100644
--- a/users/tazjin/presentations/tvix-eval-2023/default.nix
+++ b/users/tazjin/presentations/tvix-eval-2023/default.nix
@@ -47,8 +47,7 @@ stdenv.mkDerivation {
     mkdir home
     export HOME=$PWD/home
 
-    # webp images can't be included directly, need to convert to PNG
-    convert ${depot.tvix.website}/tvix-logo.webp tvix-logo.png
+    cp ${depot.tvix.logo}/logo.png tvix-logo.png
     cp ${linksQrCode} qrcode.png
 
     # As usual, TeX needs to be run twice ...