diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-05 19:42:16 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-05 19:42:16 +0200 |
| commit | 1c68570ab297a96861ec87034ff9ef155e23b0a4 (patch) | |
| tree | a6785ac0ec23ec3b4686ec4c11b0cc4590320c80 /pkgs/applications/editors | |
| parent | 462aa777dfbb45829321dead7749382e3d551e8c (diff) | |
| parent | 43f71029cc6b18c1b4db4d01b35dbb30425c2f4e (diff) | |
| download | nixlib-1c68570ab297a96861ec87034ff9ef155e23b0a4.tar nixlib-1c68570ab297a96861ec87034ff9ef155e23b0a4.tar.gz nixlib-1c68570ab297a96861ec87034ff9ef155e23b0a4.tar.bz2 nixlib-1c68570ab297a96861ec87034ff9ef155e23b0a4.tar.lz nixlib-1c68570ab297a96861ec87034ff9ef155e23b0a4.tar.xz nixlib-1c68570ab297a96861ec87034ff9ef155e23b0a4.tar.zst nixlib-1c68570ab297a96861ec87034ff9ef155e23b0a4.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/editors')
| -rw-r--r-- | pkgs/applications/editors/vscode/with-extensions.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/applications/editors/vscode/with-extensions.nix b/pkgs/applications/editors/vscode/with-extensions.nix index 5dcd1f6fb783..c30b52782ef3 100644 --- a/pkgs/applications/editors/vscode/with-extensions.nix +++ b/pkgs/applications/editors/vscode/with-extensions.nix @@ -70,6 +70,6 @@ runCommand "${wrappedPkgName}-with-extensions-${wrappedPkgVersion}" { ln -sT "${vscode}/share/applications/${executableName}.desktop" "$out/share/applications/${executableName}.desktop" ln -sT "${vscode}/share/applications/${executableName}-url-handler.desktop" "$out/share/applications/${executableName}-url-handler.desktop" makeWrapper "${vscode}/bin/${executableName}" "$out/bin/${executableName}" ${lib.optionalString (vscodeExtensions != []) '' - --add-flags "--extensions-dir ${combinedExtensionsDrv}" + --add-flags "--extensions-dir ${combinedExtensionsDrv}/share/vscode/extensions" ''} '' |