aboutsummaryrefslogtreecommitdiff
path: root/nixpkgs/pkgs/misc/vscode-extensions/vscodeEnv.nix
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/misc/vscode-extensions/vscodeEnv.nix')
-rw-r--r--nixpkgs/pkgs/misc/vscode-extensions/vscodeEnv.nix14
1 files changed, 7 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/misc/vscode-extensions/vscodeEnv.nix b/nixpkgs/pkgs/misc/vscode-extensions/vscodeEnv.nix
index 6e4bb7b3ea8..7c58a4bdfb3 100644
--- a/nixpkgs/pkgs/misc/vscode-extensions/vscodeEnv.nix
+++ b/nixpkgs/pkgs/misc/vscode-extensions/vscodeEnv.nix
@@ -21,13 +21,13 @@
, user-data-dir ? ''"''${TMP}''${name}"/vscode-data-dir''
# if file exists will use it and import the extensions in it into this dervation else will use empty extensions list
# this file will be created/updated by vscodeExts2nix when vscode exists
-, mutableExtensionsFile
+, mutableExtensionsFile
}:
-let
+let
mutableExtensionsFilePath = toString mutableExtensionsFile;
- mutableExtensions = if builtins.pathExists mutableExtensionsFile
+ mutableExtensions = if builtins.pathExists mutableExtensionsFile
then import mutableExtensionsFilePath else [];
- vscodeWithConfiguration = import ./vscodeWithConfiguration.nix {
+ vscodeWithConfiguration = import ./vscodeWithConfiguration.nix {
inherit lib writeShellScriptBin extensionsFromVscodeMarketplace;
vscodeDefault = vscode;
}
@@ -63,19 +63,19 @@ let
symlinkFromUserSetting = (user-data-dir != "");
};
- vscodeExts2nix = import ./vscodeExts2nix.nix {
+ vscodeExts2nix = import ./vscodeExts2nix.nix {
inherit lib writeShellScriptBin;
vscodeDefault = vscodeWithConfiguration;
}
{
extensionsToIgnore = nixExtensions;
- extensions = mutableExtensions;
+ extensions = mutableExtensions;
};
code = writeShellScriptBin "code" ''
${updateSettingsCmd}/bin/vscodeNixUpdate-settings
${updateLaunchCmd}/bin/vscodeNixUpdate-launch
${updateKeybindingsCmd}/bin/vscodeNixUpdate-keybindings
- ${vscodeWithConfiguration}/bin/code --wait "$@"
+ ${vscodeWithConfiguration}/bin/code --wait "$@"
echo 'running vscodeExts2nix to update ${mutableExtensionsFilePath}...'
${vscodeExts2nix}/bin/vscodeExts2nix > ${mutableExtensionsFilePath}
'';