diff options
| author | Pascal Wittmann <mail@pascal-wittmann.de> | 2019-07-10 15:19:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-10 15:19:17 +0200 |
| commit | 2ce67ce18330cbd7c6239c993c6c8a3e103d412e (patch) | |
| tree | 3c1d9ae3c95c8a45874082ae1abc782256aefe75 /pkgs/development | |
| parent | 7f8060c07f82f1f006e7c4df8601b9da35492ba9 (diff) | |
| parent | 91a14926490a84f00c4092afed317b3faadbcd25 (diff) | |
| download | nixpkgs-2ce67ce18330cbd7c6239c993c6c8a3e103d412e.tar nixpkgs-2ce67ce18330cbd7c6239c993c6c8a3e103d412e.tar.gz nixpkgs-2ce67ce18330cbd7c6239c993c6c8a3e103d412e.tar.bz2 nixpkgs-2ce67ce18330cbd7c6239c993c6c8a3e103d412e.tar.lz nixpkgs-2ce67ce18330cbd7c6239c993c6c8a3e103d412e.tar.xz nixpkgs-2ce67ce18330cbd7c6239c993c6c8a3e103d412e.tar.zst nixpkgs-2ce67ce18330cbd7c6239c993c6c8a3e103d412e.zip | |
Merge pull request #64559 from tathougies/patch-1
colm: fix cross-compilation
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/compilers/colm/cross-compile.patch | 13 | ||||
| -rw-r--r-- | pkgs/development/compilers/colm/default.nix | 6 |
2 files changed, 17 insertions, 2 deletions
diff --git a/pkgs/development/compilers/colm/cross-compile.patch b/pkgs/development/compilers/colm/cross-compile.patch new file mode 100644 index 00000000000..470ea23aaf1 --- /dev/null +++ b/pkgs/development/compilers/colm/cross-compile.patch @@ -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"]) diff --git a/pkgs/development/compilers/colm/default.nix b/pkgs/development/compilers/colm/default.nix index 888750efdf9..237a80280ec 100644 --- a/pkgs/development/compilers/colm/default.nix +++ b/pkgs/development/compilers/colm/default.nix @@ -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; |