vscode: Wrap with GAppsHook #45289
Merged
vscode: Wrap with GAppsHook #45289
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
worldofpeace
approved these changes
Aug 18, 2018
jtojnar
reviewed
Aug 18, 2018
| @@ -49,8 +49,8 @@ in | |||
| }; | |||
|
|
|||
| buildInputs = if stdenv.system == "x86_64-darwin" | |||
| then [ unzip makeWrapper libXScrnSaver libsecret ] | |||
| else [ makeWrapper libXScrnSaver libxkbfile libsecret ]; | |||
| then [ unzip makeWrapper wrapGAppsHook libXScrnSaver libsecret ] | |||
There was a problem hiding this comment.
Darwin probably does not need it. If it is like Atom, they use a different front-end for MacOS.
|
@jtojnar Okay, is this good? |
jtojnar
reviewed
Aug 18, 2018
Mic92
reviewed
Aug 18, 2018
| @@ -50,7 +50,7 @@ in | |||
|
|
|||
| buildInputs = if stdenv.system == "x86_64-darwin" | |||
| then [ unzip makeWrapper libXScrnSaver libsecret ] | |||
| else [ makeWrapper libXScrnSaver libxkbfile libsecret ]; | |||
| else [ makeWrapper wrapGAppsHook libXScrnSaver libxkbfile libsecret ]; | |||
There was a problem hiding this comment.
Why is makeWrapper in the list? To me it looks like it could be removed.
|
@Mic92 All good? |
|
Is a backport required here? |
|
Backport? |
|
is 18.03 also affected? |
|
I'm afraid I have no idea, but if the last commit I made to vscode, before this one, is on 18.03, then yes. |
|
At least for me, #45286 only appeared after the upgrade to vscode 1.26.0. 18.03 is on vscode 1.23.0, so it should be fine. I think we only need to backport this fix if we also upgrade vscode on the release branch. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
Fixes #45286
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)