mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-12 00:33:10 +00:00
Merge pull request #168882 from SuperSandro2000/vscode
vscode: fix auto encoding detection crashing editor window
This commit is contained in:
commit
937a330fff
@ -66,9 +66,9 @@ let
|
|||||||
buildInputs = [ libsecret libXScrnSaver libxshmfence ]
|
buildInputs = [ libsecret libXScrnSaver libxshmfence ]
|
||||||
++ lib.optionals (!stdenv.isDarwin) ([ at-spi2-atk ] ++ atomEnv.packages);
|
++ lib.optionals (!stdenv.isDarwin) ([ at-spi2-atk ] ++ atomEnv.packages);
|
||||||
|
|
||||||
runtimeDependencies = lib.optional (stdenv.isLinux) [ (lib.getLib systemd) fontconfig.lib libdbusmenu ];
|
runtimeDependencies = lib.optional stdenv.isLinux [ (lib.getLib systemd) fontconfig.lib libdbusmenu ];
|
||||||
|
|
||||||
nativeBuildInputs = [unzip] ++ lib.optionals (!stdenv.isDarwin) [ autoPatchelfHook wrapGAppsHook ];
|
nativeBuildInputs = [ unzip ] ++ lib.optionals stdenv.isLinux [ autoPatchelfHook nodePackages.asar wrapGAppsHook ];
|
||||||
|
|
||||||
dontBuild = true;
|
dontBuild = true;
|
||||||
dontConfigure = true;
|
dontConfigure = true;
|
||||||
@ -114,12 +114,18 @@ let
|
|||||||
# this is a fix for "save as root" functionality
|
# this is a fix for "save as root" functionality
|
||||||
packed="resources/app/node_modules.asar"
|
packed="resources/app/node_modules.asar"
|
||||||
unpacked="resources/app/node_modules"
|
unpacked="resources/app/node_modules"
|
||||||
${nodePackages.asar}/bin/asar extract "$packed" "$unpacked"
|
asar extract "$packed" "$unpacked"
|
||||||
substituteInPlace $unpacked/@vscode/sudo-prompt/index.js \
|
substituteInPlace $unpacked/@vscode/sudo-prompt/index.js \
|
||||||
--replace "/usr/bin/pkexec" "/run/wrappers/bin/pkexec" \
|
--replace "/usr/bin/pkexec" "/run/wrappers/bin/pkexec" \
|
||||||
--replace "/bin/bash" "${bash}/bin/bash"
|
--replace "/bin/bash" "${bash}/bin/bash"
|
||||||
rm -rf "$packed"
|
rm -rf "$packed"
|
||||||
|
|
||||||
|
# without this symlink loading JsChardet, the library that is used for auto encoding detection when files.autoGuessEncoding is true,
|
||||||
|
# fails to load with: electron/js2c/renderer_init: Error: Cannot find module 'jschardet'
|
||||||
|
# and the window immediately closes which renders VSCode unusable
|
||||||
|
# see https://github.com/NixOS/nixpkgs/issues/152939 for full log
|
||||||
|
ln -rs "$unpacked" "$packed"
|
||||||
|
|
||||||
# this fixes bundled ripgrep
|
# this fixes bundled ripgrep
|
||||||
chmod +x resources/app/node_modules/@vscode/ripgrep/bin/rg
|
chmod +x resources/app/node_modules/@vscode/ripgrep/bin/rg
|
||||||
'';
|
'';
|
||||||
|
Loading…
Reference in New Issue
Block a user