Merge pull request #136805 from prusnak/gocryptfs

gocryptfs: build documentation on aarch64-darwin again
This commit is contained in:
Jörg Thalheim 2021-09-07 03:36:16 +01:00 committed by GitHub
commit 935e64716f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -8,12 +8,6 @@
, libfido2 , libfido2
}: }:
let
# pandoc is currently broken on aarch64-darwin
# because of missing ghc
brokenPandoc = stdenv.isDarwin && stdenv.isAarch64;
in
buildGoModule rec { buildGoModule rec {
pname = "gocryptfs"; pname = "gocryptfs";
version = "2.1"; version = "2.1";
@ -29,7 +23,6 @@ buildGoModule rec {
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config
] ++ lib.optionals (!brokenPandoc) [
pandoc pandoc
]; ];
@ -45,7 +38,7 @@ buildGoModule rec {
subPackages = [ "." "gocryptfs-xray" "contrib/statfs" ]; subPackages = [ "." "gocryptfs-xray" "contrib/statfs" ];
postBuild = lib.optionalString (!brokenPandoc) '' postBuild = ''
pushd Documentation/ pushd Documentation/
mkdir -p $out/share/man/man1 mkdir -p $out/share/man/man1
# taken from Documentation/MANPAGE-render.bash # taken from Documentation/MANPAGE-render.bash