diff options
author | Edmund Wu <fangkazuto@gmail.com> | 2020-05-30 16:50:15 -0400 |
---|---|---|
committer | Edmund Wu <fangkazuto@gmail.com> | 2020-05-30 16:50:15 -0400 |
commit | 4f99c5725e8a01f0d31a90e880495c19f6b530e7 (patch) | |
tree | 37a5f3a28eb25e687ad1009cef053c6bdc0d1fb8 /pkgs/misc/vscode-extensions | |
parent | 0717848d7bb5adb01c7a9f293ed07676099de6f2 (diff) | |
download | nixlib-4f99c5725e8a01f0d31a90e880495c19f6b530e7.tar nixlib-4f99c5725e8a01f0d31a90e880495c19f6b530e7.tar.gz nixlib-4f99c5725e8a01f0d31a90e880495c19f6b530e7.tar.bz2 nixlib-4f99c5725e8a01f0d31a90e880495c19f6b530e7.tar.lz nixlib-4f99c5725e8a01f0d31a90e880495c19f6b530e7.tar.xz nixlib-4f99c5725e8a01f0d31a90e880495c19f6b530e7.tar.zst nixlib-4f99c5725e8a01f0d31a90e880495c19f6b530e7.zip |
vscode-extensions.vscode-utils: reapply some changes from bb24faf
https://github.com/NixOS/nixpkgs/commit/bb24fafbfad04cd23431de14176cdc581a906f66
Diffstat (limited to 'pkgs/misc/vscode-extensions')
-rw-r--r-- | pkgs/misc/vscode-extensions/vscode-utils.nix | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/pkgs/misc/vscode-extensions/vscode-utils.nix b/pkgs/misc/vscode-extensions/vscode-utils.nix index 7ea76309f145..1de3bce3d0db 100644 --- a/pkgs/misc/vscode-extensions/vscode-utils.nix +++ b/pkgs/misc/vscode-extensions/vscode-utils.nix @@ -1,12 +1,7 @@ { stdenv, lib, buildEnv, writeShellScriptBin, fetchurl, vscode, unzip, jq }: let - extendedPkgVersion = lib.getVersion vscode; - extendedPkgName = lib.removeSuffix "-${extendedPkgVersion}" vscode.name; - - buildVscodeExtension = a@{ name, - namePrefix ? "${extendedPkgName}-extension-", src, # Same as "Unique Identifier" on the extension's web page. # For the moment, only serve as unique extension dir. @@ -20,12 +15,12 @@ let }: stdenv.mkDerivation ((removeAttrs a [ "vscodeExtUniqueId" ]) // { - name = namePrefix + name; + name = "vscode-extension-${name}"; inherit vscodeExtUniqueId; inherit configurePhase buildPhase dontPatchELF dontStrip; - installPrefix = "share/${extendedPkgName}/extensions/${vscodeExtUniqueId}"; + installPrefix = "share/vscode/extensions/${vscodeExtUniqueId}"; buildInputs = [ unzip ] ++ buildInputs; |