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

php: Re-indent main derivation

Browse Source
This commit is contained in:
Elis Hirwing 2020-03-15 10:27:37 +01:00
parent 6c0fa331f0
commit da3384a25d
No known key found for this signature in database
GPG Key ID: D57EFA625C9A925F
1 changed files with 112 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,20 +67,16 @@ let
, ipv6Support ? config.php.ipv6 or true , ipv6Support ? config.php.ipv6 or true
, pearSupport ? (config.php.pear or true) && (libxml2Support) , pearSupport ? (config.php.pear or true) && (libxml2Support)
}: }:
let let
libmcrypt' = libmcrypt.override { disablePosixThreads = true; }; libmcrypt' = libmcrypt.override { disablePosixThreads = true; };
in stdenv.mkDerivation { in stdenv.mkDerivation {
pname = "php";
inherit version; inherit version;
pname = "php";
enableParallelBuilding = true; enableParallelBuilding = true;
nativeBuildInputs = [ nativeBuildInputs = [ autoconf automake bison file flex libtool pkgconfig re2c ];
autoconf automake bison file flex libtool pkgconfig re2c
];
buildInputs = [ ] buildInputs = [ ]
++ optional (versionOlder version "7.3") pcre ++ optional (versionOlder version "7.3") pcre
@ -116,9 +112,7 @@ let
CXXFLAGS = optionalString stdenv.cc.isClang "-std=c++11"; CXXFLAGS = optionalString stdenv.cc.isClang "-std=c++11";
configureFlags = [ configureFlags = [ "--with-config-file-scan-dir=/etc/php.d" ]
"--with-config-file-scan-dir=/etc/php.d"
]
++ optionals (versionOlder version "7.3") [ "--with-pcre-regex=${pcre.dev}" "PCRE_LIBDIR=${pcre}" ] ++ optionals (versionOlder version "7.3") [ "--with-pcre-regex=${pcre.dev}" "PCRE_LIBDIR=${pcre}" ]
++ optionals (versions.majorMinor version == "7.3") [ "--with-pcre-regex=${pcre2.dev}" "PCRE_LIBDIR=${pcre2}" ] ++ optionals (versions.majorMinor version == "7.3") [ "--with-pcre-regex=${pcre2.dev}" "PCRE_LIBDIR=${pcre2}" ]
++ optionals (versionAtLeast version "7.4") [ "--with-external-pcre=${pcre2.dev}" "PCRE_LIBDIR=${pcre2}" ] ++ optionals (versionAtLeast version "7.4") [ "--with-external-pcre=${pcre2.dev}" "PCRE_LIBDIR=${pcre2}" ]
@ -266,7 +260,6 @@ let
stripDebugList = "bin sbin lib modules"; stripDebugList = "bin sbin lib modules";
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
}; };
generic' = { version, sha256, ... }@args: let php = generic args; in php.overrideAttrs (_: { generic' = { version, sha256, ... }@args: let php = generic args; in php.overrideAttrs (_: {