From 1ca2efe1d91208dda5e75af9aa8dfa7fd11ebc46 Mon Sep 17 00:00:00 2001
From: Mynacol <git@mynacol.xyz>
Date: Fri, 10 Jul 2026 11:49:11 +0000
Subject: [PATCH 1/4] deno: de-vendor sqlite

---
 pkgs/by-name/de/deno/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/de/deno/package.nix b/pkgs/by-name/de/deno/package.nix
index 9ccc1cb21e96..fc82b4b6acee 100644
--- a/pkgs/by-name/de/deno/package.nix
+++ b/pkgs/by-name/de/deno/package.nix
@@ -101,6 +101,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
   # To avoid this we pre-download the file and export it via RUSTY_V8_ARCHIVE
   env.RUSTY_V8_ARCHIVE = librusty_v8;
 
+  # de-vendor SQLite
+  env.LIBSQLITE3_SYS_USE_PKG_CONFIG = true;
+
   # Don't run checks on hydra as they've been observed to be flakey for us and
   # other distros CI: https://gitlab.alpinelinux.org/alpine/aports/-/blob/bec8b026686323b496365b825ad14fdf4473adf2/community/deno/APKBUILD#L79
   # We haven't reproduced it on local machines, could be related to doing other

From 7aa5f006109ead02584707e7489cee4e22633460 Mon Sep 17 00:00:00 2001
From: Mynacol <git@mynacol.xyz>
Date: Fri, 10 Jul 2026 12:22:04 +0000
Subject: [PATCH 2/4] deno: de-vendor zstd

---
 pkgs/by-name/de/deno/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/de/deno/package.nix b/pkgs/by-name/de/deno/package.nix
index fc82b4b6acee..64b6ca5a23a6 100644
--- a/pkgs/by-name/de/deno/package.nix
+++ b/pkgs/by-name/de/deno/package.nix
@@ -13,6 +13,8 @@
   librusty_v8 ? callPackage ./rusty-v8 { },
   libffi,
   sqlite,
+  pkg-config,
+  zstd,
   lld,
   writableTmpDirAsHomeHook,
 
@@ -65,6 +67,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   buildInputs = [
     libffi
     sqlite
+    zstd
   ];
 
   # uses zlib-ng but can't dynamically link yet
@@ -75,6 +78,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
     yq
     # required by libz-ng-sys crate
     cmake
+    # required to de-vendor zstd
+    pkg-config
     # required by deno_kv crate
     protobuf
     installShellFiles
@@ -103,6 +108,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   # de-vendor SQLite
   env.LIBSQLITE3_SYS_USE_PKG_CONFIG = true;
+  # de-vendor zstd
+  env.ZSTD_SYS_USE_PKG_CONFIG = true;
 
   # Don't run checks on hydra as they've been observed to be flakey for us and
   # other distros CI: https://gitlab.alpinelinux.org/alpine/aports/-/blob/bec8b026686323b496365b825ad14fdf4473adf2/community/deno/APKBUILD#L79

From 758cb24c4c37a88bf19aa2fa627e08a0f9a7c3eb Mon Sep 17 00:00:00 2001
From: Mynacol <git@mynacol.xyz>
Date: Fri, 10 Jul 2026 13:24:37 +0000
Subject: [PATCH 3/4] deno: de-vendor lcms2

---
 pkgs/by-name/de/deno/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/de/deno/package.nix b/pkgs/by-name/de/deno/package.nix
index 64b6ca5a23a6..5a8a92767de4 100644
--- a/pkgs/by-name/de/deno/package.nix
+++ b/pkgs/by-name/de/deno/package.nix
@@ -15,6 +15,7 @@
   sqlite,
   pkg-config,
   zstd,
+  lcms2,
   lld,
   writableTmpDirAsHomeHook,
 
@@ -110,6 +111,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   env.LIBSQLITE3_SYS_USE_PKG_CONFIG = true;
   # de-vendor zstd
   env.ZSTD_SYS_USE_PKG_CONFIG = true;
+  # de-vendor lcms2
+  env.LCMS2_LIB_DIR = lib.makeLibraryPath [ lcms2 ];
 
   # Don't run checks on hydra as they've been observed to be flakey for us and
   # other distros CI: https://gitlab.alpinelinux.org/alpine/aports/-/blob/bec8b026686323b496365b825ad14fdf4473adf2/community/deno/APKBUILD#L79

From c5c5d1c84763a3b04576eb7d107266e228729126 Mon Sep 17 00:00:00 2001
From: Mynacol <Mynacol@users.noreply.github.com>
Date: Tue, 28 Jul 2026 13:29:00 +0000
Subject: [PATCH 4/4] deno: de-vendor zlib

---
 pkgs/by-name/de/deno/package.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/by-name/de/deno/package.nix b/pkgs/by-name/de/deno/package.nix
index 5a8a92767de4..c4fcb50fda5f 100644
--- a/pkgs/by-name/de/deno/package.nix
+++ b/pkgs/by-name/de/deno/package.nix
@@ -71,8 +71,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     zstd
   ];
 
-  # uses zlib-ng but can't dynamically link yet
-  # https://github.com/rust-lang/libz-sys/issues/158
   nativeBuildInputs = [
     rustPlatform.bindgenHook
     # for tomlq to adjust Cargo.toml
@@ -97,9 +95,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   # Disable the default feature `upgrade` (which controls the self-update subcommand and update checks)
   buildNoDefaultFeatures = true;
-  buildFeatures = [
-    "__vendored_zlib_ng"
-  ];
 
   # work around "error: unknown warning group '-Wunused-but-set-parameter'"
   env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unknown-warning-option";