diff --git a/pkgs/by-name/pi/picocrypt-ng/package.nix b/pkgs/by-name/pi/picocrypt-ng/package.nix
index 026dbbad8989..f3535dfa8f22 100644
--- a/pkgs/by-name/pi/picocrypt-ng/package.nix
+++ b/pkgs/by-name/pi/picocrypt-ng/package.nix
@@ -12,6 +12,7 @@
   pkg-config,
   wrapGAppsHook3,
   writableTmpDirAsHomeHook,
+  llvmPackages,
 }:
 
 buildGoModule (finalAttrs: {
@@ -49,7 +50,9 @@ buildGoModule (finalAttrs: {
     pkg-config
     wrapGAppsHook3
     writableTmpDirAsHomeHook
-  ];
+  ]
+  # TODO: Remove once #536365 reaches this branch
+  ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.lld;
 
   # git ls-files doesn't work as source is not a git repo
   checkFlags =
@@ -61,7 +64,13 @@ buildGoModule (finalAttrs: {
     in
     [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
 
-  env.CGO_ENABLED = 1;
+  env = {
+    CGO_ENABLED = 1;
+  }
+  // lib.optionalAttrs stdenv.hostPlatform.isDarwin {
+    # TODO: Remove once #536365 reaches this branch
+    NIX_CFLAGS_LINK = "-fuse-ld=lld";
+  };
 
   postInstall = ''
     mv $out/bin/picocrypt $out/bin/picocrypt-ng-gui
diff --git a/pkgs/by-name/pi/picocrypt/package.nix b/pkgs/by-name/pi/picocrypt/package.nix
index cfa8906fdd91..4728d400dc5c 100644
--- a/pkgs/by-name/pi/picocrypt/package.nix
+++ b/pkgs/by-name/pi/picocrypt/package.nix
@@ -11,6 +11,7 @@
   gtk3,
   pkg-config,
   wrapGAppsHook3,
+  llvmPackages,
 }:
 
 buildGoModule (finalAttrs: {
@@ -46,9 +47,17 @@ buildGoModule (finalAttrs: {
     copyDesktopItems
     pkg-config
     wrapGAppsHook3
-  ];
+  ]
+  # TODO: Remove once #536365 reaches this branch
+  ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.lld;
 
-  env.CGO_ENABLED = 1;
+  env = {
+    CGO_ENABLED = 1;
+  }
+  // lib.optionalAttrs stdenv.hostPlatform.isDarwin {
+    # TODO: Remove once #536365 reaches this branch
+    NIX_CFLAGS_LINK = "-fuse-ld=lld";
+  };
 
   postInstall = ''
     mv $out/bin/Picocrypt $out/bin/picocrypt-gui