public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

php: update build configuration

Browse Source
This commit is contained in:
Izorkin 2019-12-10 20:40:33 +03:00
parent 0ee5d55d3b
commit ffe90532f7
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pkgs/development/interpreters/php/default.nix
View File

@ -1,7 +1,8 @@
# pcre functionality is tested in nixos/tests/php-pcre.nix # pcre functionality is tested in nixos/tests/php-pcre.nix
{ lib, stdenv, fetchurl, autoconf, bison, libtool, pkgconfig, re2c { config, lib, stdenv, fetchurl
, autoconf, automake, bison, file, flex, libtool, pkgconfig, re2c
, libxml2, readline, zlib, curl, postgresql, gettext , libxml2, readline, zlib, curl, postgresql, gettext
, openssl, pcre, pcre2, sqlite, config , openssl, pcre, pcre2, sqlite
, libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, unixODBC , libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, unixODBC
, uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium, html-tidy, libargon2 , uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium, html-tidy, libargon2
, gd, freetype, libXpm, libjpeg, libpng, libwebp , gd, freetype, libXpm, libjpeg, libpng, libwebp
@ -72,11 +73,14 @@ let
inherit version; inherit version;
name = "php-${version}"; pname = "php";
enableParallelBuilding = true; enableParallelBuilding = true;
nativeBuildInputs = [ autoconf bison libtool pkgconfig re2c ]; nativeBuildInputs = [
autoconf automake bison file flex libtool pkgconfig re2c
];
buildInputs = [ ] buildInputs = [ ]
++ optional (versionOlder version "7.3") pcre ++ optional (versionOlder version "7.3") pcre
++ optional (versionAtLeast version "7.3") pcre2 ++ optional (versionAtLeast version "7.3") pcre2
@ -138,7 +142,6 @@ let
++ optional (libxml2Support && (versionOlder version "7.4")) "--with-libxml-dir=${libxml2.dev}" ++ optional (libxml2Support && (versionOlder version "7.4")) "--with-libxml-dir=${libxml2.dev}"
++ optional (!libxml2Support) [ ++ optional (!libxml2Support) [
"--disable-dom" "--disable-dom"
"--disable-libxml"
(if (versionOlder version "7.4") then "--disable-libxml" else "--without-libxml") (if (versionOlder version "7.4") then "--disable-libxml" else "--without-libxml")
"--disable-simplexml" "--disable-simplexml"
"--disable-xml" "--disable-xml"
@ -217,11 +220,17 @@ let
--replace '@PHP_LDFLAGS@' "" --replace '@PHP_LDFLAGS@' ""
done done
#[[ -z "$libxml2" ]] || addToSearchPath PATH $libxml2/bin substituteInPlace ./build/libtool.m4 --replace /usr/bin/file ${file}/bin/file
export EXTENSION_DIR=$out/lib/php/extensions export EXTENSION_DIR=$out/lib/php/extensions
./buildconf --force ./buildconf --copy --force
if test -f $src/genfiles; then
./genfiles
fi
'' + optionalString stdenv.isDarwin ''
substituteInPlace configure --replace "-lstdc++" "-lc++"
''; '';
postInstall = '' postInstall = ''
@ -253,10 +262,6 @@ let
patches = [ ./fix-paths-php7.patch ] ++ extraPatches; patches = [ ./fix-paths-php7.patch ] ++ extraPatches;
postPatch = optional stdenv.isDarwin ''
substituteInPlace configure --replace "-lstdc++" "-lc++"
'';
stripDebugList = "bin sbin lib modules"; stripDebugList = "bin sbin lib modules";
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];