From d2724c13463a5a65d44092459b0650def2b8c4f4 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 26 Dec 2017 18:55:48 +0200 Subject: [PATCH] sshfs-fuse: No need for rst2man.py patch anymore --- .../filesystems/sshfs-fuse/build-man-pages.patch | 11 ----------- pkgs/tools/filesystems/sshfs-fuse/default.nix | 8 +++----- 2 files changed, 3 insertions(+), 16 deletions(-) delete mode 100644 pkgs/tools/filesystems/sshfs-fuse/build-man-pages.patch diff --git a/pkgs/tools/filesystems/sshfs-fuse/build-man-pages.patch b/pkgs/tools/filesystems/sshfs-fuse/build-man-pages.patch deleted file mode 100644 index fba1d250c42b..000000000000 --- a/pkgs/tools/filesystems/sshfs-fuse/build-man-pages.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 eebe3076c98a..6fd55c369d59 100644 --- a/pkgs/tools/filesystems/sshfs-fuse/default.nix +++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, meson, pkgconfig, ninja, glib, fuse3 -, buildManPages ? true, docutils +, docutils }: let @@ -15,10 +15,8 @@ in stdenv.mkDerivation rec { sha256 = "15z1mlad09llckkadvjfzmbv14fbq218xmb4axkmi7kzixbi41hv"; }; - patches = optional buildManPages ./build-man-pages.patch; - - nativeBuildInputs = [ meson pkgconfig ninja ]; - buildInputs = [ fuse3 glib ] ++ optional buildManPages docutils; + nativeBuildInputs = [ meson pkgconfig ninja docutils ]; + buildInputs = [ fuse3 glib ]; NIX_CFLAGS_COMPILE = stdenv.lib.optional (stdenv.system == "i686-linux")