Merge pull request #31139 from pbogdan/fix-build-pecl

build-pecl: honour nativeBuildInputs
This commit is contained in:
Jörg Thalheim 2017-11-02 18:54:27 +00:00 committed by GitHub
commit 9b82f1749b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2,6 +2,7 @@
{ name { name
, buildInputs ? [] , buildInputs ? []
, nativeBuildInputs ? []
, makeFlags ? [] , makeFlags ? []
, src ? fetchurl { , src ? fetchurl {
url = "http://pecl.php.net/get/${name}.tgz"; url = "http://pecl.php.net/get/${name}.tgz";
@ -15,7 +16,7 @@ stdenv.mkDerivation (args // {
inherit src; inherit src;
nativeBuildInputs = [ autoreconfHook ]; nativeBuildInputs = [ autoreconfHook ] ++ nativeBuildInputs;
buildInputs = [ php ] ++ buildInputs; buildInputs = [ php ] ++ buildInputs;
makeFlags = [ "EXTENSION_DIR=$(out)/lib/php/extensions" ] ++ makeFlags; makeFlags = [ "EXTENSION_DIR=$(out)/lib/php/extensions" ] ++ makeFlags;