public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vscode-utils/vscodeEnv: split to 2 functions vscodeWithConfiguration, vscodeExts2nix, vscodeEnv

Browse Source 
change usage of toPath with toString
This commit is contained in:
Oren Rozen
2019-12-28 16:43:41 -05:00
parent 2d59425555
commit 7fc2b2ad7e
4 changed files with 50 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/misc/vscode-extensions/vscode-utils.nix
+13 -12
View File
@@ -1,4 +1,4 @@
{ stdenv, lib, writeShellScriptBin, fetchurl, vscode, unzip }:
{ stdenv, lib, buildEnv, writeShellScriptBin, fetchurl, vscode, unzip }:
let
extendedPkgVersion = lib.getVersion vscode;
@@ -73,21 +73,22 @@ let
extensionsFromVscodeMarketplace = mktplcExtRefList:
builtins.map extensionFromVscodeMarketplace mktplcExtRefList;
vscodeWithConfiguration = (userParams : import ./vscodeWithConfiguration.nix {
inherit lib vscode extensionsFromVscodeMarketplace writeShellScriptBin;
} // userParams);
vscodeWithConfiguration = import ./vscodeWithConfiguration.nix {
inherit lib extensionsFromVscodeMarketplace writeShellScriptBin;
vscodeDefault = vscode;
};
vscodeExts2nix = (userParams : import ./vscodeExts2nix.nix {
inherit lib vscode;
} // userParams);
vscodeEnv = (userParams : import ./vscodeEnv.nix {
inherit lib writeShellScriptBin extensionsFromVscodeMarketplace vscode;
} // userParams );
vscodeExts2nix = import ./vscodeExts2nix.nix {
inherit lib writeShellScriptBin;
vscodeDefault = vscode;
};
vscodeEnv = import ./vscodeEnv.nix {
inherit lib buildEnv writeShellScriptBin extensionsFromVscodeMarketplace;
vscodeDefault = vscode;
};
in
{
inherit fetchVsixFromVscodeMarketplace buildVscodeExtension
buildVscodeMarketplaceExtension extensionFromVscodeMarketplace