Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: eee71d85d5f4
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 84d9355dde72
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jul 24, 2018

  1. Copy the full SHA
    8582bf5 View commit details

Commits on Jul 29, 2018

  1. Merge pull request #44055 from ljli/vscode-fix-stable

    vscode: fix keymapping.node rpath
    Mic92 authored Jul 29, 2018
    Copy the full SHA
    84d9355 View commit details
Showing with 5 additions and 0 deletions.
  1. +5 −0 pkgs/applications/editors/vscode/default.nix
5 changes: 5 additions & 0 deletions pkgs/applications/editors/vscode/default.nix
Original file line number Diff line number Diff line change
@@ -81,6 +81,11 @@ in
--set-rpath "${rpath}" \
$out/lib/vscode/resources/app/node_modules.asar.unpacked/keytar/build/Release/keytar.node
patchelf \
--set-rpath "${rpath}" \
"$out/lib/vscode/resources/app/node_modules.asar.unpacked/native-keymap/build/Release/\
keymapping.node"
ln -s ${lib.makeLibraryPath [libsecret]}/libsecret-1.so.0 $out/lib/vscode/libsecret-1.so.0
'';