Merge branch 'fix/cross-swig' into HEAD

+5 -2
+5 -2
pkgs/development/tools/misc/swig/3.x.nix
··· 1 - { stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }: 2 3 stdenv.mkDerivation rec { 4 name = "swig-${version}"; ··· 11 sha256 = "1wyffskbkzj5zyhjnnpip80xzsjcr3p0q5486z3wdwabnysnhn8n"; 12 }; 13 14 - nativeBuildInputs = [ autoconf automake libtool bison ]; 15 buildInputs = [ pcre ]; 16 17 configureFlags = [ "--without-tcl" ];
··· 1 + { stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre, buildPackages }: 2 3 stdenv.mkDerivation rec { 4 name = "swig-${version}"; ··· 11 sha256 = "1wyffskbkzj5zyhjnnpip80xzsjcr3p0q5486z3wdwabnysnhn8n"; 12 }; 13 14 + # for cross-compiling we need pcre.dev in nativeBuildInputs to get pcre-config 15 + nativeBuildInputs = [ autoconf automake libtool bison pcre.dev ]; 16 + disallowedReferences = [ buildPackages.pcre.dev ]; 17 + 18 buildInputs = [ pcre ]; 19 20 configureFlags = [ "--without-tcl" ];