This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit d42554a55b6c818fa74ec2a08c20cf2c2e0f45f4 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Nov 9 23:38:52 2018 +0100 Add support for Nix OS for common_sftp_dirs's hard-coded sftp-server paths. --- debian/changelog | 5 +++++ src/onmainwindow.cpp | 1 + 2 files changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index f7d56cb..80ffd18 100644 --- a/debian/changelog +++ b/debian/changelog @@ -53,6 +53,11 @@ x2goclient (4.1.2.2-0x2go1) UNRELEASED; urgency=medium - Revert the gettext-tools-mini change, was caused by an outdated obs-build version. + [ Mike Gabriel ] + * New upstream version (4.1.2.2): + - Add support for Nix OS for common_sftp_dirs's hard-coded + sftp-server paths. + -- X2Go Release Manager <git-admin@x2go.org> Tue, 26 Jun 2018 00:39:28 +0200 x2goclient (4.1.2.1-0x2go1) unstable; urgency=medium diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 52e765c..dd67f99 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -10572,6 +10572,7 @@ void ONMainWindow::generateEtcFiles() << "/usr/lib/ssh" /* Mageia, OpenSUSE, SLE{S,D} < 12 x86, SLE{S,D} 12, Arch */ << "/usr/lib64/ssh" /* SLE{S,D} < 12 x86_64 */ << "/usr/lib/misc" /* Gentoo */ + << "/run/current-system/sw/bin/sftp-server" /* NixOS */ << "/usr/libexec"; /* Slackware, OS X */ #if QT_VERSION < 0x050000 -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git