diff options
| -rw-r--r-- | tvix/README.md | 2 | ||||
| -rw-r--r-- | tvix/default.nix | 10 | ||||
| -rw-r--r-- | tvix/logo.webp (renamed from tvix/website/tvix-logo.webp) | bin | 82366 -> 82366 bytes | |||
| -rw-r--r-- | tvix/website/default.nix | 2 | ||||
| -rw-r--r-- | tvix/website/landing-en.md | 2 | ||||
| -rw-r--r-- | users/tazjin/presentations/tvix-eval-2023/default.nix | 3 |
6 files changed, 14 insertions, 5 deletions
diff --git a/tvix/README.md b/tvix/README.md index 02f3b480ba4e..42659336e8b2 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 e36883b4712d..4abf27f46374 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 07bffc18b7b9..07bffc18b7b9 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 2dd939e8a939..ed955e4d241b 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 d95320f11c21..2018e67b0679 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 ce831556de89..a4d855197c5e 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 ... |
