diff --git a/packages/genodelabs/default.nix b/packages/genodelabs/default.nix
index 27dba2c..f70d276 100644
--- a/packages/genodelabs/default.nix
+++ b/packages/genodelabs/default.nix
@@ -130,9 +130,8 @@ let
   # The "ports" mechanism is hardly deterministic, so prepare with
   # a pinned nixpkgs revision for a pinned platform.
 
-  toolchain = buildPackages.buildPackages.callPackage ./toolchain.nix { };
-
-  stdenv' = pkgs.stdenvAdapters.overrideCC pkgs.stdenv toolchain;
+  stdenv' = pkgs.stdenvAdapters.overrideCC pkgs.stdenv
+    buildPackages.llvmPackages_11.lldClangNoCompilerRt;
 
   buildUpstream =
     # Build from the Genode sources
@@ -328,7 +327,8 @@ let
 in makePackages // depotPackages // {
 
   genodeSources = genodeSources // {
-    inherit arch buildUpstream buildDepot genodeBase ports specs toolchain;
+    inherit arch buildUpstream buildDepot genodeBase ports specs;
+    stdenv = stdenv';
   };
 
   base-hw-pc = buildUpstream {