diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2017-12-26 18:55:48 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2017-12-26 20:02:01 +0200 |
| commit | d2724c13463a5a65d44092459b0650def2b8c4f4 (patch) | |
| tree | 717f5bd3ade08c9af48a02bc8e29f41191d61d80 /pkgs/tools/filesystems/sshfs-fuse | |
| parent | c47a1ba62a1bdcb3724b9cb1a2d9fbf2c684e03b (diff) | |
| download | nixpkgs-d2724c13463a5a65d44092459b0650def2b8c4f4.tar nixpkgs-d2724c13463a5a65d44092459b0650def2b8c4f4.tar.gz nixpkgs-d2724c13463a5a65d44092459b0650def2b8c4f4.tar.bz2 nixpkgs-d2724c13463a5a65d44092459b0650def2b8c4f4.tar.lz nixpkgs-d2724c13463a5a65d44092459b0650def2b8c4f4.tar.xz nixpkgs-d2724c13463a5a65d44092459b0650def2b8c4f4.tar.zst nixpkgs-d2724c13463a5a65d44092459b0650def2b8c4f4.zip | |
sshfs-fuse: No need for rst2man.py patch anymore
Diffstat (limited to 'pkgs/tools/filesystems/sshfs-fuse')
| -rw-r--r-- | pkgs/tools/filesystems/sshfs-fuse/build-man-pages.patch | 11 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/sshfs-fuse/default.nix | 8 |
2 files changed, 3 insertions, 16 deletions
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 fba1d250c42..00000000000 --- 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 eebe3076c98..6fd55c369d5 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") |