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

Merge pull request #124138 from talyz/21.05-php-iconv-errno

Browse Source 
[21.05] php74.extensions.iconv: fix error signalling
This commit is contained in:
Kim Lindberger 2021-05-23 17:48:31 +02:00 committed by GitHub
commit df25a8867f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/top-level/php-packages.nix
View File

@ -322,10 +322,16 @@ lib.makeScope pkgs.newScope (self: with self; {
configureFlags = [ "--with-gmp=${gmp.dev}" ]; } configureFlags = [ "--with-gmp=${gmp.dev}" ]; }
{ name = "hash"; enable = lib.versionOlder php.version "7.4"; } { name = "hash"; enable = lib.versionOlder php.version "7.4"; }
{ name = "iconv"; { name = "iconv";
configureFlags = if stdenv.isDarwin then configureFlags = [
[ "--with-iconv=${libiconv}" ] "--with-iconv${lib.optionalString stdenv.isDarwin "=${libiconv}"}"
else ];
[ "--with-iconv" ]; patches = lib.optionals (lib.versionOlder php.version "8.0") [
# Header path defaults to FHS location, preventing the configure script from detecting errno support.
(fetchpatch {
url = "https://github.com/fossar/nix-phps/raw/263861a8c9bdafd7abe44db6db4ef0179643680c/pkgs/iconv-header-path.patch";
sha256 = "7GHnEUu+hcsQ4h3itDwk6p46ZKfib9JZ2XpWlXrdn6E=";
})
];
doCheck = false; } doCheck = false; }
{ name = "imap"; { name = "imap";
buildInputs = [ uwimap openssl pam pcre' ]; buildInputs = [ uwimap openssl pam pcre' ];