public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sshfs-fuse: No need for rst2man.py patch anymore

Browse Source
This commit is contained in:
Tuomas Tynkkynen 2017-12-26 18:55:48 +02:00
parent c47a1ba62a
commit d2724c1346
2 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/tools/filesystems/sshfs-fuse/build-man-pages.patch
View File

@ -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()

8
pkgs/tools/filesystems/sshfs-fuse/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, meson, pkgconfig, ninja, glib, fuse3 { stdenv, fetchFromGitHub, meson, pkgconfig, ninja, glib, fuse3
, buildManPages ? true, docutils , docutils
}: }:
let let
@ -15,10 +15,8 @@ in stdenv.mkDerivation rec {
sha256 = "15z1mlad09llckkadvjfzmbv14fbq218xmb4axkmi7kzixbi41hv"; sha256 = "15z1mlad09llckkadvjfzmbv14fbq218xmb4axkmi7kzixbi41hv";
}; };
patches = optional buildManPages ./build-man-pages.patch; nativeBuildInputs = [ meson pkgconfig ninja docutils ];
buildInputs = [ fuse3 glib ];
nativeBuildInputs = [ meson pkgconfig ninja ];
buildInputs = [ fuse3 glib ] ++ optional buildManPages docutils;
NIX_CFLAGS_COMPILE = stdenv.lib.optional NIX_CFLAGS_COMPILE = stdenv.lib.optional
(stdenv.system == "i686-linux") (stdenv.system == "i686-linux")