sshfs: 3.2.0 -> 3.3.0
This commit is contained in:
parent
7d98316a97
commit
699231ed78
2 changed files with 28 additions and 5 deletions
11
pkgs/tools/filesystems/sshfs-fuse/build-man-pages.patch
Normal file
11
pkgs/tools/filesystems/sshfs-fuse/build-man-pages.patch
Normal file
|
@ -0,0 +1,11 @@
|
|||
--- a/meson.build 2017-09-23 22:02:57.770555382 +0200
|
||||
+++ b/meson.build 2017-09-23 23:11:28.258095182 +0200
|
||||
@@ -25,7 +25,7 @@
|
||||
endif
|
||||
|
||||
|
||||
-rst2man = find_program('rst2man', required: false)
|
||||
+rst2man = find_program('rst2man.py', required: true)
|
||||
|
||||
cfg = configuration_data()
|
||||
|
|
@ -1,17 +1,25 @@
|
|||
{ stdenv, fetchFromGitHub, pkgconfig, glib, fuse3, autoreconfHook }:
|
||||
{ stdenv, fetchFromGitHub, meson, pkgconfig, ninja, glib, fuse3
|
||||
, buildManPages ? true, docutils
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.2.0";
|
||||
let
|
||||
inherit (stdenv.lib) optional;
|
||||
rpath = stdenv.lib.makeLibraryPath [ fuse3 glib ];
|
||||
in stdenv.mkDerivation rec {
|
||||
version = "3.3.0";
|
||||
name = "sshfs-fuse-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libfuse";
|
||||
repo = "sshfs";
|
||||
rev = "sshfs-${version}";
|
||||
sha256 = "09pqdibhcj1p7m6vxkqiprvbcxp9iq2lm1hb6w7p8iarmvp80rlv";
|
||||
sha256 = "1hn5c0059ppjqygdhvapxm7lrqm5bnpwaxgjylskz04c0vr8nygp";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig glib fuse3 autoreconfHook ];
|
||||
patches = optional buildManPages ./build-man-pages.patch;
|
||||
|
||||
nativeBuildInputs = [ meson pkgconfig ninja ];
|
||||
buildInputs = [ fuse3 glib ] ++ optional buildManPages docutils;
|
||||
|
||||
NIX_CFLAGS_COMPILE = stdenv.lib.optional
|
||||
(stdenv.system == "i686-linux")
|
||||
|
@ -22,6 +30,10 @@ stdenv.mkDerivation rec {
|
|||
ln -sf $out/bin/sshfs $out/sbin/mount.sshfs
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
patchelf --set-rpath '${rpath}' "$out/bin/sshfs"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
inherit (src.meta) homepage;
|
||||
description = "FUSE-based filesystem that allows remote filesystems to be mounted over SSH";
|
||||
|
|
Loading…
Reference in a new issue