diff options
| author | Tim Steinbach <tim@nequissimus.com> | 2017-09-08 12:20:20 -0400 |
|---|---|---|
| committer | Tim Steinbach <tim@nequissimus.com> | 2017-09-08 16:01:35 -0400 |
| commit | 58963fda09c2249e1aca5c471a0970da02419747 (patch) | |
| tree | 6cbb919000a03ad9aa9108f32f40199c4f96f3d1 /pkgs/applications/editors | |
| parent | 5d1a8ecd916893ac377311de4abd5d7043646280 (diff) | |
| download | nixlib-58963fda09c2249e1aca5c471a0970da02419747.tar nixlib-58963fda09c2249e1aca5c471a0970da02419747.tar.gz nixlib-58963fda09c2249e1aca5c471a0970da02419747.tar.bz2 nixlib-58963fda09c2249e1aca5c471a0970da02419747.tar.lz nixlib-58963fda09c2249e1aca5c471a0970da02419747.tar.xz nixlib-58963fda09c2249e1aca5c471a0970da02419747.tar.zst nixlib-58963fda09c2249e1aca5c471a0970da02419747.zip | |
vscode: 1.15.1 -> 1.16.0
Diffstat (limited to 'pkgs/applications/editors')
| -rw-r--r-- | pkgs/applications/editors/vscode/default.nix | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index 1f91bdfa3a58..e0de8facd3f2 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -1,8 +1,8 @@ { stdenv, lib, callPackage, fetchurl, unzip, atomEnv, makeDesktopItem, - makeWrapper, libXScrnSaver, libxkbfile }: + makeWrapper, libXScrnSaver, libxkbfile, libsecret }: let - version = "1.15.1"; + version = "1.16.0"; channel = "stable"; plat = { @@ -12,15 +12,16 @@ let }.${stdenv.system}; sha256 = { - "i686-linux" = "09vvq02bsq6fdb0ibshn97kll43dpfmyq2dahl9gj02jlwardq27"; - "x86_64-linux" = "1kg25i4kavmgivnk4w3dsbsnn9vncl5d2m0ds93f8qvmxpizwg21"; - "x86_64-darwin" = "1fgjg7c9appp8v0ir7m2r3a3x4z0gx4na0p3d8j1x4pcs0kqy0qp"; + "i686-linux" = "04jf9rl5116qc3n7xgqxir9c54dpkjm210yinih0qnp1wxhb6q0m"; + "x86_64-linux" = "125xl933y4zmvp4922wm6b3p5d2xfdi9c5a7svx63p6fwxqjk33y"; + "x86_64-darwin" = "0v8v4spz31qbv5ikb4bkdfldmpj5i6ahlzwn2h5wbfzlzsl8bk24"; }.${stdenv.system}; archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz"; rpath = lib.concatStringsSep ":" [ atomEnv.libPath + "${lib.makeLibraryPath [libsecret]}/libsecret-1.so.0" "${lib.makeLibraryPath [libXScrnSaver]}/libXss.so.1" "${lib.makeLibraryPath [libxkbfile]}/libxkbfile.so.1" "$out/lib/vscode" @@ -47,8 +48,8 @@ in }; buildInputs = if stdenv.system == "x86_64-darwin" - then [ unzip makeWrapper libXScrnSaver ] - else [ makeWrapper libXScrnSaver libxkbfile ]; + then [ unzip makeWrapper libXScrnSaver libsecret ] + else [ makeWrapper libXScrnSaver libxkbfile libsecret ]; installPhase = if stdenv.system == "x86_64-darwin" then '' @@ -75,6 +76,12 @@ in --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${rpath}" \ $out/lib/vscode/code + + patchelf \ + --set-rpath "${rpath}" \ + $out/lib/vscode/resources/app/node_modules/keytar/build/Release/keytar.node + + ln -s ${lib.makeLibraryPath [libsecret]}/libsecret-1.so.0 $out/lib/vscode/libsecret-1.so.0 ''; meta = with stdenv.lib; { |