From f0f635a4343fed09b7582799f2f6929067970bd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Na=C3=AFm=20Favier?= <n@monade.li>
Date: Tue, 19 Jul 2022 14:37:00 +0200
Subject: [PATCH] vscode-extensions: properly split marketplace ref attributes

So that e.g. `postPatch` isn't passed to `mktplcExtRefToFetchArgs.nix`
---
 .../editors/vscode/extensions/vscode-utils.nix             | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/vscode-utils.nix b/pkgs/applications/editors/vscode/extensions/vscode-utils.nix
index 49b730361af1..8f0112e5f608 100644
--- a/pkgs/applications/editors/vscode/extensions/vscode-utils.nix
+++ b/pkgs/applications/editors/vscode/extensions/vscode-utils.nix
@@ -43,7 +43,7 @@ let
   });
 
   fetchVsixFromVscodeMarketplace = mktplcExtRef:
-    fetchurl((import ./mktplcExtRefToFetchArgs.nix mktplcExtRef));
+    fetchurl (import ./mktplcExtRefToFetchArgs.nix mktplcExtRef);
 
   buildVscodeMarketplaceExtension = a@{
     name ? "",
@@ -65,11 +65,12 @@ let
     "publisher"
     "version"
     "sha256"
+    "arch"
   ];
 
   mktplcExtRefToExtDrv = ext:
-    buildVscodeMarketplaceExtension ((removeAttrs ext mktplcRefAttrList) // {
-      mktplcRef = ext;
+    buildVscodeMarketplaceExtension (removeAttrs ext mktplcRefAttrList // {
+      mktplcRef = builtins.intersectAttrs (lib.genAttrs mktplcRefAttrList (_: null)) ext;
     });
 
   extensionFromVscodeMarketplace = mktplcExtRefToExtDrv;