tjh.dev
sshfs: 3.2.0 -> 3.3.0
(cherry picked from commit 699231ed78ca41db175579bb1d7790a20beb75c4)
authored by
Michael Weiss
and committed by
Robin Gloster
af367259
be26a1c0
+11
pkgs/tools/filesystems/sshfs-fuse/build-man-pages.patch
+11
pkgs/tools/filesystems/sshfs-fuse/build-man-pages.patch
···
···
1
+
--- a/meson.build 2017-09-23 22:02:57.770555382 +0200
2
+
+++ b/meson.build 2017-09-23 23:11:28.258095182 +0200
3
+
@@ -25,7 +25,7 @@
4
+
endif
5
+
6
+
7
+
-rst2man = find_program('rst2man', required: false)
8
+
+rst2man = find_program('rst2man.py', required: true)
9
+
10
+
cfg = configuration_data()
11
+
+17
-5
pkgs/tools/filesystems/sshfs-fuse/default.nix
+17
-5
pkgs/tools/filesystems/sshfs-fuse/default.nix
···
1
-
{ stdenv, fetchFromGitHub, pkgconfig, glib, fuse3, autoreconfHook }:
2
3
-
stdenv.mkDerivation rec {
4
-
version = "3.2.0";
5
name = "sshfs-fuse-${version}";
6
7
src = fetchFromGitHub {
8
owner = "libfuse";
9
repo = "sshfs";
10
rev = "sshfs-${version}";
11
-
sha256 = "09pqdibhcj1p7m6vxkqiprvbcxp9iq2lm1hb6w7p8iarmvp80rlv";
12
};
13
14
-
buildInputs = [ pkgconfig glib fuse3 autoreconfHook ];
15
16
NIX_CFLAGS_COMPILE = stdenv.lib.optional
17
(stdenv.system == "i686-linux")
···
20
postInstall = ''
21
mkdir -p $out/sbin
22
ln -sf $out/bin/sshfs $out/sbin/mount.sshfs
23
'';
24
25
meta = with stdenv.lib; {
···
1
+
{ stdenv, fetchFromGitHub, meson, pkgconfig, ninja, glib, fuse3
2
+
, buildManPages ? true, docutils
3
+
}:
4
5
+
let
6
+
inherit (stdenv.lib) optional;
7
+
rpath = stdenv.lib.makeLibraryPath [ fuse3 glib ];
8
+
in stdenv.mkDerivation rec {
9
+
version = "3.3.0";
10
name = "sshfs-fuse-${version}";
11
12
src = fetchFromGitHub {
13
owner = "libfuse";
14
repo = "sshfs";
15
rev = "sshfs-${version}";
16
+
sha256 = "1hn5c0059ppjqygdhvapxm7lrqm5bnpwaxgjylskz04c0vr8nygp";
17
};
18
19
+
patches = optional buildManPages ./build-man-pages.patch;
20
+
21
+
nativeBuildInputs = [ meson pkgconfig ninja ];
22
+
buildInputs = [ fuse3 glib ] ++ optional buildManPages docutils;
23
24
NIX_CFLAGS_COMPILE = stdenv.lib.optional
25
(stdenv.system == "i686-linux")
···
28
postInstall = ''
29
mkdir -p $out/sbin
30
ln -sf $out/bin/sshfs $out/sbin/mount.sshfs
31
+
'';
32
+
33
+
postFixup = ''
34
+
patchelf --set-rpath '${rpath}' "$out/bin/sshfs"
35
'';
36
37
meta = with stdenv.lib; {