Merge branch 'fix/cross-swig' into HEAD

This commit is contained in:
Jörg Thalheim 2018-11-28 10:31:23 +00:00
commit 8e97e8009f
No known key found for this signature in database
GPG Key ID: CA4106B8D7CC79FA

View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }:
{ stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre, buildPackages }:
stdenv.mkDerivation rec {
name = "swig-${version}";
@ -11,7 +11,10 @@ stdenv.mkDerivation rec {
sha256 = "1wyffskbkzj5zyhjnnpip80xzsjcr3p0q5486z3wdwabnysnhn8n";
};
nativeBuildInputs = [ autoconf automake libtool bison ];
# for cross-compiling we need pcre.dev in nativeBuildInputs to get pcre-config
nativeBuildInputs = [ autoconf automake libtool bison pcre.dev ];
disallowedReferences = [ buildPackages.pcre.dev ];
buildInputs = [ pcre ];
configureFlags = [ "--without-tcl" ];