diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2018-11-28 10:31:23 +0000 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2018-11-28 10:31:23 +0000 |
| commit | 8e97e8009f88380ec4975fb162969757d5037bdc (patch) | |
| tree | 5bba45095a31e57c3fa1b6290099c09f5c2b6ace /pkgs | |
| parent | 834e7c4f0b46ac499166536551a18c008398a464 (diff) | |
| parent | be6b461bb9e07df8d93a3cc6432b74550acf12c4 (diff) | |
| download | nixpkgs-8e97e8009f88380ec4975fb162969757d5037bdc.tar nixpkgs-8e97e8009f88380ec4975fb162969757d5037bdc.tar.gz nixpkgs-8e97e8009f88380ec4975fb162969757d5037bdc.tar.bz2 nixpkgs-8e97e8009f88380ec4975fb162969757d5037bdc.tar.lz nixpkgs-8e97e8009f88380ec4975fb162969757d5037bdc.tar.xz nixpkgs-8e97e8009f88380ec4975fb162969757d5037bdc.tar.zst nixpkgs-8e97e8009f88380ec4975fb162969757d5037bdc.zip | |
Merge branch 'fix/cross-swig' into HEAD
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/tools/misc/swig/3.x.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/development/tools/misc/swig/3.x.nix b/pkgs/development/tools/misc/swig/3.x.nix index 077d037aa97..9dc2b535c09 100644 --- a/pkgs/development/tools/misc/swig/3.x.nix +++ b/pkgs/development/tools/misc/swig/3.x.nix @@ -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" ]; |