From 6d12b1646076915aea64c785f6d8364b68b1f89a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@cachix.org>
Date: Sun, 13 Sep 2026 18:02:19 -0500
Subject: [PATCH 1/2] devenv: include proxy in build targets

Build devenv-proxy alongside devenv and devenv-run-tests, retaining
the existing test package selection. Disable vendored OpenSSL to use
the packaged library.

Assisted-by: Codex (GPT-6)
---
 pkgs/by-name/de/devenv/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/de/devenv/package.nix b/pkgs/by-name/de/devenv/package.nix
index 052b0152f6e4..73ba57efa572 100644
--- a/pkgs/by-name/de/devenv/package.nix
+++ b/pkgs/by-name/de/devenv/package.nix
@@ -59,6 +59,7 @@ rustPlatform.buildRustPackage {
   env = {
     RUSTFLAGS = "--cfg tracing_unstable";
     LIBSQLITE3_SYS_USE_PKG_CONFIG = "1";
+    OPENSSL_NO_VENDOR = "1";
     DEVENV_IS_RELEASE = true;
   };
 
@@ -67,6 +68,8 @@ rustPlatform.buildRustPackage {
     "devenv"
     "-p"
     "devenv-run-tests"
+    "-p"
+    "devenv-proxy"
   ];
 
   nativeBuildInputs = [

From d121c742e341bad42ec7a17825363af884ff524e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@cachix.org>
Date: Sun, 13 Sep 2026 20:02:32 -0500
Subject: [PATCH 2/2] devenv: use mold on Linux

Select mold through the stdenv adapter for Linux builds, retaining the default linker on other platforms.

Assisted-by: Codex (GPT-6)
---
 pkgs/by-name/de/devenv/package.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/de/devenv/package.nix b/pkgs/by-name/de/devenv/package.nix
index 73ba57efa572..07d8712073b6 100644
--- a/pkgs/by-name/de/devenv/package.nix
+++ b/pkgs/by-name/de/devenv/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   stdenv,
+  useMoldLinker,
   fetchFromGitHub,
   gitMinimal,
   makeBinaryWrapper,
@@ -42,8 +43,11 @@ let
       version = devenvNixVersion;
     }
   );
+  buildRustPackage = rustPlatform.buildRustPackage.override {
+    stdenv = if stdenv.hostPlatform.isLinux then useMoldLinker stdenv else stdenv;
+  };
 in
-rustPlatform.buildRustPackage {
+buildRustPackage {
   pname = "devenv";
   inherit version;