3
0
Fork 0
forked from mirrors/nixpkgs

Merge pull request #71072 from minijackson/ssh-in-sshfs-env

sshfs: add ssh program to the environment
This commit is contained in:
Michael Weiss 2019-10-14 15:34:20 +02:00 committed by GitHub
commit 41ce7871ac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,6 +1,7 @@
{ stdenv, fetchFromGitHub, meson, pkgconfig, ninja, docutils
{ stdenv, fetchFromGitHub, meson, pkgconfig, ninja, docutils, makeWrapper
, fuse3, glib
, which, python3Packages
, openssh
}:
stdenv.mkDerivation rec {
@ -14,7 +15,7 @@ stdenv.mkDerivation rec {
sha256 = "0gvk8snivpi2sjidjnd9ypc66ny7lr0z9v4swl56rwjv539dkbx2";
};
nativeBuildInputs = [ meson pkgconfig ninja docutils ];
nativeBuildInputs = [ meson pkgconfig ninja docutils makeWrapper ];
buildInputs = [ fuse3 glib ];
checkInputs = [ which python3Packages.pytest ];
@ -25,6 +26,7 @@ stdenv.mkDerivation rec {
postInstall = ''
mkdir -p $out/sbin
ln -sf $out/bin/sshfs $out/sbin/mount.sshfs
wrapProgram $out/bin/sshfs --prefix PATH : "${openssh}/bin"
'';
#doCheck = true;