Merge pull request #53065 from matthewbauer/rpi-cross-fixes

Raspberry Pi cross compilation branch
2019-01-03 15:34:31 -06:00
parent 729cc52ae9 9c5cde46a6
commit 9b0e45bf8b
11 changed files with 18 additions and 42 deletions
--- a/pkgs/development/tools/misc/swig/3.x.nix
+++ b/pkgs/development/tools/misc/swig/3.x.nix
@@ -11,10 +11,8 @@ stdenv.mkDerivation rec {
    sha256 = "1wyffskbkzj5zyhjnnpip80xzsjcr3p0q5486z3wdwabnysnhn8n";
  };

-  # for cross-compiling we need pcre.dev in nativeBuildInputs to get pcre-config
-  nativeBuildInputs = [ autoconf automake libtool bison pcre.dev ];
-  disallowedReferences = [ buildPackages.pcre.dev ];
-
+  PCRE_CONFIG = "${pcre.dev}/bin/pcre-config";
+  nativeBuildInputs = [ autoconf automake libtool bison ];
  buildInputs = [ pcre ];

  configureFlags = [ "--without-tcl" ];