Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tigervnc: correct default ssh client path #29084

Merged
merged 2 commits into from Sep 8, 2017
Merged

Conversation

jasom
Copy link
Contributor

@jasom jasom commented Sep 7, 2017

The -via command sets up an ssh tunnel, but is hardcoded to /usr/bin/ssh
upstream. This patches it to use the nixpkgs openssh client.

Motivation for this change

Currently the -via command does not work without manually setting the VNC_VIA_CMD environment variable

Fixes #29003

CC @viric

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

The -via command sets up an ssh tunnel, but is hardcoded to /usr/bin/ssh
upstream.  This patches it to use the nixpkgs openssh client.
Copy link
Member

@LnL7 LnL7 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you change the existing patchPhase to postPatch and include this snippet in there it should work.

@@ -91,6 +91,11 @@ stdenv.mkDerivation rec {

enableParallelBuilding = true;

postPatch = ''
Copy link
Member

@LnL7 LnL7 Sep 8, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The patchPhase is overridden, so the post hook won't get executed.

@Mic92 Mic92 merged commit e9183fd into NixOS:master Sep 8, 2017
@Mic92
Copy link
Member

Mic92 commented Sep 8, 2017

here we go!

fpletz pushed a commit that referenced this pull request Sep 10, 2017
* tigervnc: correct default ssh client path

The -via command sets up an ssh tunnel, but is hardcoded to /usr/bin/ssh
upstream.  This patches it to use the nixpkgs openssh client.

* tigervnc: patch ssh path correctly

(cherry picked from commit e9183fd)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

tigervnc references /usr/bin/ssh for launching tunnel
4 participants