Merge pull request #64559 from tathougies/patch-1

colm: fix cross-compilation
This commit is contained in:
Pascal Wittmann 2019-07-10 15:19:17 +02:00 committed by GitHub
commit 2ce67ce183
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 2 deletions

View File

@ -0,0 +1,13 @@
--- a/configure.ac 2019-07-09 22:41:03.166948024 -0700
+++ b/configure.ac 2019-07-09 22:41:16.699948056 -0700
@@ -40,9 +40,7 @@
dnl Choose a default for the build_manual var. If the dist file is present in
dnl the root then default to no, otherwise go for it.
-AC_CHECK_FILES( [$srcdir/DIST],
- [. $srcdir/DIST;],
- [build_manual=yes; ] )
+build_manual=yes;
dnl Set to true if the manual should be built.
AM_CONDITIONAL(BUILD_MANUAL, [test "x$build_manual" = "xyes"])

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, makeWrapper, gcc, asciidoc }:
{ stdenv, fetchurl, makeWrapper, gcc, asciidoc, autoreconfHook }:
stdenv.mkDerivation rec {
name = "colm-${version}";
@ -9,7 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "0f76iri173l2wja2v7qrwmf958cqwh5g9x4bhj2z8wknmlla6gz4";
};
nativeBuildInputs = [ makeWrapper asciidoc ];
patches = [ ./cross-compile.patch ];
nativeBuildInputs = [ makeWrapper asciidoc autoreconfHook ];
doCheck = true;