public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/filesystems/sshfs-fuse/default.nix
View File

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