diff options
author | Vladimír Čunát <v@cunat.cz> | 2019-06-14 17:47:23 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2019-06-14 17:47:23 +0200 |
commit | 788261a1a900d59098e521590cff21c2cefdf4bb (patch) | |
tree | 98d815cdb72bdd769c4bd8f627da0b05c3a60645 /pkgs/build-support | |
parent | 7184efb40af0e740000e678a727922a7f58ac597 (diff) | |
parent | 21fdd139680e43cc493723d6e181fde5f6fed26e (diff) | |
download | nixlib-788261a1a900d59098e521590cff21c2cefdf4bb.tar nixlib-788261a1a900d59098e521590cff21c2cefdf4bb.tar.gz nixlib-788261a1a900d59098e521590cff21c2cefdf4bb.tar.bz2 nixlib-788261a1a900d59098e521590cff21c2cefdf4bb.tar.lz nixlib-788261a1a900d59098e521590cff21c2cefdf4bb.tar.xz nixlib-788261a1a900d59098e521590cff21c2cefdf4bb.tar.zst nixlib-788261a1a900d59098e521590cff21c2cefdf4bb.zip |
Merge branch 'master' into staging-next
Brings in Haskell rebuild. Hydra nixpkgs: ?compare=1525186
Diffstat (limited to 'pkgs/build-support')
-rw-r--r-- | pkgs/build-support/build-pecl.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/build-support/build-pecl.nix b/pkgs/build-support/build-pecl.nix index d08f8822d751..a1030e3b34fa 100644 --- a/pkgs/build-support/build-pecl.nix +++ b/pkgs/build-support/build-pecl.nix @@ -1,4 +1,4 @@ -{ stdenv, php, autoreconfHook, fetchurl }: +{ stdenv, php, autoreconfHook, fetchurl, re2c }: { pname , version @@ -17,7 +17,7 @@ stdenv.mkDerivation (args // { inherit src; - nativeBuildInputs = [ autoreconfHook ] ++ nativeBuildInputs; + nativeBuildInputs = [ autoreconfHook re2c ] ++ nativeBuildInputs; buildInputs = [ php ] ++ buildInputs; makeFlags = [ "EXTENSION_DIR=$(out)/lib/php/extensions" ] ++ makeFlags; |