diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2017-09-23 22:16:14 +0200 |
|---|---|---|
| committer | Michael Weiss <dev.primeos@gmail.com> | 2017-09-23 23:15:36 +0200 |
| commit | 699231ed78ca41db175579bb1d7790a20beb75c4 (patch) | |
| tree | 1bbfed2066eefe9cfb9ef712adc3bfd41272d2f1 /pkgs | |
| parent | 7d98316a9745ae6538f90dc580b0873074dfd5e5 (diff) | |
| download | nixlib-699231ed78ca41db175579bb1d7790a20beb75c4.tar nixlib-699231ed78ca41db175579bb1d7790a20beb75c4.tar.gz nixlib-699231ed78ca41db175579bb1d7790a20beb75c4.tar.bz2 nixlib-699231ed78ca41db175579bb1d7790a20beb75c4.tar.lz nixlib-699231ed78ca41db175579bb1d7790a20beb75c4.tar.xz nixlib-699231ed78ca41db175579bb1d7790a20beb75c4.tar.zst nixlib-699231ed78ca41db175579bb1d7790a20beb75c4.zip | |
sshfs: 3.2.0 -> 3.3.0
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/filesystems/sshfs-fuse/build-man-pages.patch | 11 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/sshfs-fuse/default.nix | 22 |
2 files changed, 28 insertions, 5 deletions
diff --git a/pkgs/tools/filesystems/sshfs-fuse/build-man-pages.patch b/pkgs/tools/filesystems/sshfs-fuse/build-man-pages.patch new file mode 100644 index 000000000000..fba1d250c42b --- /dev/null +++ b/pkgs/tools/filesystems/sshfs-fuse/build-man-pages.patch @@ -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() + diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix index 274be305da84..eace7c2783e1 100644 --- a/pkgs/tools/filesystems/sshfs-fuse/default.nix +++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix @@ -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"; |