lol

treewide/php-packages: Drop pkgs from arguments to packages

+90 -91
+2 -2
pkgs/development/php-packages/box/default.nix
··· 1 - { mkDerivation, fetchurl, pkgs, lib, php }: 1 + { mkDerivation, fetchurl, makeWrapper, lib, php }: 2 2 let 3 3 pname = "box"; 4 4 version = "2.7.5"; ··· 12 12 }; 13 13 14 14 phases = [ "installPhase" ]; 15 - nativeBuildInputs = [ pkgs.makeWrapper ]; 15 + nativeBuildInputs = [ makeWrapper ]; 16 16 17 17 installPhase = '' 18 18 mkdir -p $out/bin
+4 -4
pkgs/development/php-packages/composer/2.0.nix
··· 1 - { mkDerivation, fetchurl, pkgs, lib, php }: 1 + { mkDerivation, fetchurl, makeWrapper, unzip, lib, php }: 2 2 let 3 3 pname = "composer"; 4 4 version = "2.0.11"; ··· 13 13 14 14 dontUnpack = true; 15 15 16 - nativeBuildInputs = [ pkgs.makeWrapper ]; 16 + nativeBuildInputs = [ makeWrapper ]; 17 17 18 18 installPhase = '' 19 19 mkdir -p $out/bin 20 20 install -D $src $out/libexec/composer/composer.phar 21 21 makeWrapper ${php}/bin/php $out/bin/composer \ 22 22 --add-flags "$out/libexec/composer/composer.phar" \ 23 - --prefix PATH : ${pkgs.lib.makeBinPath [ pkgs.unzip ]} 23 + --prefix PATH : ${lib.makeBinPath [ unzip ]} 24 24 ''; 25 25 26 - meta = with pkgs.lib; { 26 + meta = with lib; { 27 27 description = "Dependency Manager for PHP"; 28 28 license = licenses.mit; 29 29 homepage = "https://getcomposer.org/";
+4 -4
pkgs/development/php-packages/composer/default.nix
··· 1 - { mkDerivation, fetchurl, pkgs, lib, php }: 1 + { mkDerivation, fetchurl, makeWrapper, unzip, lib, php }: 2 2 let 3 3 pname = "composer"; 4 4 version = "1.10.15"; ··· 13 13 14 14 dontUnpack = true; 15 15 16 - nativeBuildInputs = [ pkgs.makeWrapper ]; 16 + nativeBuildInputs = [ makeWrapper ]; 17 17 18 18 installPhase = '' 19 19 mkdir -p $out/bin 20 20 install -D $src $out/libexec/composer/composer.phar 21 21 makeWrapper ${php}/bin/php $out/bin/composer \ 22 22 --add-flags "$out/libexec/composer/composer.phar" \ 23 - --prefix PATH : ${pkgs.lib.makeBinPath [ pkgs.unzip ]} 23 + --prefix PATH : ${lib.makeBinPath [ unzip ]} 24 24 ''; 25 25 26 - meta = with pkgs.lib; { 26 + meta = with lib; { 27 27 description = "Dependency Manager for PHP"; 28 28 license = licenses.mit; 29 29 homepage = "https://getcomposer.org/";
+5 -5
pkgs/development/php-packages/couchbase/default.nix
··· 1 - { buildPecl, lib, pkgs, php }: 1 + { lib, buildPecl, fetchFromGitHub, writeText, libcouchbase, zlib, php }: 2 2 let 3 3 pname = "couchbase"; 4 4 version = "2.6.2"; ··· 6 6 buildPecl { 7 7 inherit pname version; 8 8 9 - src = pkgs.fetchFromGitHub { 9 + src = fetchFromGitHub { 10 10 owner = "couchbase"; 11 11 repo = "php-couchbase"; 12 12 rev = "v${version}"; ··· 16 16 configureFlags = [ "--with-couchbase" ]; 17 17 broken = lib.versionAtLeast php.version "8.0"; 18 18 19 - buildInputs = with pkgs; [ libcouchbase zlib ]; 19 + buildInputs = [ libcouchbase zlib ]; 20 20 internalDeps = [] ++ lib.optionals (lib.versionOlder php.version "8.0") [ php.extensions.json ]; 21 21 peclDeps = [ php.extensions.igbinary ]; 22 22 23 23 patches = [ 24 - (pkgs.writeText "php-couchbase.patch" '' 24 + (writeText "php-couchbase.patch" '' 25 25 --- a/config.m4 26 26 +++ b/config.m4 27 27 @@ -9,7 +9,7 @@ if test "$PHP_COUCHBASE" != "no"; then ··· 29 29 else 30 30 AC_MSG_CHECKING(for libcouchbase in default path) 31 31 - for i in /usr/local /usr; do 32 - + for i in ${pkgs.libcouchbase}; do 32 + + for i in ${libcouchbase}; do 33 33 if test -r $i/include/libcouchbase/couchbase.h; then 34 34 LIBCOUCHBASE_DIR=$i 35 35 AC_MSG_RESULT(found in $i)
+5 -5
pkgs/development/php-packages/event/default.nix
··· 1 - { buildPecl, lib, pkgs, php }: 1 + { buildPecl, lib, php, pkg-config, openssl, libevent }: 2 2 buildPecl { 3 3 pname = "event"; 4 4 ··· 6 6 sha256 = "1ws4l014z52vb23xbsfj6viwkf7fmh462af639xgbp0n6syf77dq"; 7 7 8 8 configureFlags = [ 9 - "--with-event-libevent-dir=${pkgs.libevent.dev}" 9 + "--with-event-libevent-dir=${libevent.dev}" 10 10 "--with-event-core" 11 11 "--with-event-extra" 12 12 "--with-event-pthreads" ··· 18 18 ':' 19 19 ''; 20 20 21 - nativeBuildInputs = [ pkgs.pkg-config ]; 22 - buildInputs = with pkgs; [ openssl libevent ]; 21 + nativeBuildInputs = [ pkg-config ]; 22 + buildInputs = [ openssl libevent ]; 23 23 internalDeps = [ php.extensions.sockets ]; 24 24 25 - meta = with pkgs.lib; { 25 + meta = with lib; { 26 26 description = '' 27 27 This is an extension to efficiently schedule I/O, time and signal based 28 28 events using the best I/O notification mechanism available for specific platform.
+3 -3
pkgs/development/php-packages/imagick/default.nix
··· 1 - { buildPecl, fetchpatch, lib, pkgs, pcre' }: 1 + { buildPecl, fetchpatch, lib, imagemagick7, pkg-config, pcre' }: 2 2 3 3 buildPecl { 4 4 pname = "imagick"; ··· 19 19 }) 20 20 ]; 21 21 22 - configureFlags = [ "--with-imagick=${pkgs.imagemagick7.dev}" ]; 23 - nativeBuildInputs = [ pkgs.pkg-config ]; 22 + configureFlags = [ "--with-imagick=${imagemagick7.dev}" ]; 23 + nativeBuildInputs = [ pkg-config ]; 24 24 buildInputs = [ pcre' ]; 25 25 26 26 meta.maintainers = lib.teams.php.members;
+4 -4
pkgs/development/php-packages/maxminddb/default.nix
··· 1 - { buildPecl, lib, pkgs }: 1 + { buildPecl, lib, fetchFromGitHub, libmaxminddb }: 2 2 let 3 3 pname = "maxminddb"; 4 4 version = "1.10.0"; ··· 6 6 buildPecl { 7 7 inherit pname version; 8 8 9 - src = pkgs.fetchFromGitHub { 9 + src = fetchFromGitHub { 10 10 owner = "maxmind"; 11 11 repo = "MaxMind-DB-Reader-php"; 12 12 rev = "v${version}"; 13 13 sha256 = "sha256-2SnajDdO5uAYcuVpEbOuFlZzMxwo/EqFtUSr9XxT0KQ="; 14 14 }; 15 15 16 - buildInputs = [ pkgs.libmaxminddb ]; 16 + buildInputs = [ libmaxminddb ]; 17 17 sourceRoot = "source/ext"; 18 18 19 - meta = with pkgs.lib; { 19 + meta = with lib; { 20 20 description = "C extension that is a drop-in replacement for MaxMind\\Db\\Reader"; 21 21 license = with licenses; [ asl20 ]; 22 22 maintainers = with maintainers; [ ajs124 das_j ] ++ teams.php.members;
+5 -5
pkgs/development/php-packages/memcached/default.nix
··· 1 - { buildPecl, lib, fetchgit, php, pkgs }: 1 + { buildPecl, lib, fetchgit, php, cyrus_sasl, zlib, pkg-config, libmemcached }: 2 2 let 3 3 pname = "memcached"; 4 4 version = "3.1.5"; ··· 19 19 ]; 20 20 21 21 configureFlags = [ 22 - "--with-zlib-dir=${pkgs.zlib.dev}" 23 - "--with-libmemcached-dir=${pkgs.libmemcached}" 22 + "--with-zlib-dir=${zlib.dev}" 23 + "--with-libmemcached-dir=${libmemcached}" 24 24 ]; 25 25 26 - nativeBuildInputs = [ pkgs.pkg-config ]; 27 - buildInputs = with pkgs; [ cyrus_sasl zlib ]; 26 + nativeBuildInputs = [ pkg-config ]; 27 + buildInputs = [ cyrus_sasl zlib ]; 28 28 29 29 meta.maintainers = lib.teams.php.members; 30 30 }
+5 -4
pkgs/development/php-packages/mongodb/default.nix
··· 1 - { buildPecl, lib, pkgs, pcre' }: 1 + { stdenv, buildPecl, lib, pcre', pkg-config, cyrus_sasl, icu64 2 + , openssl, snappy, zlib, darwin }: 2 3 3 4 buildPecl { 4 5 pname = "mongodb"; ··· 6 7 version = "1.9.0"; 7 8 sha256 = "16mbw3p80qxsj86nmjbfch8wv6jaq8wbz4rlpmixvhj9nwbp37hs"; 8 9 9 - nativeBuildInputs = [ pkgs.pkg-config ]; 10 - buildInputs = with pkgs; [ 10 + nativeBuildInputs = [ pkg-config ]; 11 + buildInputs = [ 11 12 cyrus_sasl 12 13 icu64 13 14 openssl 14 15 snappy 15 16 zlib 16 17 pcre' 17 - ] ++ lib.optional (pkgs.stdenv.isDarwin) pkgs.darwin.apple_sdk.frameworks.Security; 18 + ] ++ lib.optionals (stdenv.isDarwin) darwin.apple_sdk.frameworks.Security; 18 19 19 20 meta.maintainers = lib.teams.php.members; 20 21 }
+4 -4
pkgs/development/php-packages/oci8/default.nix
··· 1 - { buildPecl, lib, pkgs, version, sha256 }: 1 + { buildPecl, lib, version, sha256, oracle-instantclient }: 2 2 buildPecl { 3 3 pname = "oci8"; 4 4 5 5 inherit version sha256; 6 6 7 - buildInputs = [ pkgs.oracle-instantclient ]; 8 - configureFlags = [ "--with-oci8=shared,instantclient,${pkgs.oracle-instantclient.lib}/lib" ]; 7 + buildInputs = [ oracle-instantclient ]; 8 + configureFlags = [ "--with-oci8=shared,instantclient,${oracle-instantclient.lib}/lib" ]; 9 9 10 10 postPatch = '' 11 - sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${pkgs.oracle-instantclient.dev}/include"|' config.m4 11 + sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${oracle-instantclient.dev}/include"|' config.m4 12 12 ''; 13 13 14 14 meta.maintainers = lib.teams.php.members;
+4 -4
pkgs/development/php-packages/pdlib/default.nix
··· 1 - { buildPecl, lib, pkgs }: 1 + { buildPecl, fetchFromGitHub, lib, pkg-config, dlib }: 2 2 let 3 3 pname = "pdlib"; 4 4 version = "1.0.2"; ··· 6 6 buildPecl { 7 7 inherit pname version; 8 8 9 - src = pkgs.fetchFromGitHub { 9 + src = fetchFromGitHub { 10 10 owner = "goodspb"; 11 11 repo = "pdlib"; 12 12 rev = "v${version}"; 13 13 sha256 = "0qnmqwlw5vb2rvliap4iz9val6mal4qqixcw69pwskdw5jka6v5i"; 14 14 }; 15 15 16 - nativeBuildInputs = [ pkgs.pkg-config ]; 17 - buildInputs = [ (pkgs.dlib.override { guiSupport = true; }) ]; 16 + nativeBuildInputs = [ pkg-config ]; 17 + buildInputs = [ (dlib.override { guiSupport = true; }) ]; 18 18 19 19 meta = with lib; { 20 20 description = "A PHP extension for Dlib";
+2 -2
pkgs/development/php-packages/pdo_sqlsrv/default.nix
··· 1 - { buildPecl, lib, pkgs, php }: 1 + { stdenv, buildPecl, lib, libiconv, unixODBC, php }: 2 2 3 3 buildPecl { 4 4 pname = "pdo_sqlsrv"; ··· 8 8 9 9 internalDeps = [ php.extensions.pdo ]; 10 10 11 - buildInputs = [ pkgs.unixODBC ] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.libiconv ]; 11 + buildInputs = [ unixODBC ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; 12 12 13 13 meta.maintainers = lib.teams.php.members; 14 14 }
+3 -3
pkgs/development/php-packages/php-cs-fixer/default.nix
··· 1 - { mkDerivation, fetchurl, pkgs, lib, php }: 1 + { mkDerivation, fetchurl, makeWrapper, lib, php }: 2 2 let 3 3 pname = "php-cs-fixer"; 4 4 version = "2.18.2"; ··· 12 12 }; 13 13 14 14 phases = [ "installPhase" ]; 15 - nativeBuildInputs = [ pkgs.makeWrapper ]; 15 + nativeBuildInputs = [ makeWrapper ]; 16 16 17 17 installPhase = '' 18 18 mkdir -p $out/bin ··· 21 21 --add-flags "$out/libexec/php-cs-fixer/php-cs-fixer.phar" 22 22 ''; 23 23 24 - meta = with pkgs.lib; { 24 + meta = with lib; { 25 25 description = "A tool to automatically fix PHP coding standards issues"; 26 26 license = licenses.mit; 27 27 homepage = "http://cs.sensiolabs.org/";
+3 -3
pkgs/development/php-packages/php-parallel-lint/default.nix
··· 1 - { mkDerivation, fetchFromGitHub, pkgs, lib, php }: 1 + { mkDerivation, fetchFromGitHub, makeWrapper, lib, php }: 2 2 let 3 3 pname = "php-parallel-lint"; 4 4 version = "1.0.0"; ··· 14 14 }; 15 15 16 16 nativeBuildInputs = [ 17 - pkgs.makeWrapper 17 + makeWrapper 18 18 php.packages.composer 19 19 php.packages.box 20 20 ]; ··· 31 31 --add-flags "$out/libexec/php-parallel-lint/php-parallel-lint.phar" 32 32 ''; 33 33 34 - meta = with pkgs.lib; { 34 + meta = with lib; { 35 35 description = "Tool to check syntax of PHP files faster than serial check with fancier output"; 36 36 license = licenses.bsd2; 37 37 homepage = "https://github.com/JakubOnderka/PHP-Parallel-Lint";
+4 -4
pkgs/development/php-packages/php_excel/default.nix
··· 1 - { buildPecl, fetchurl, lib, pkgs }: 1 + { buildPecl, fetchurl, lib, libxl }: 2 2 let 3 3 pname = "php_excel"; 4 4 phpVersion = "php7"; ··· 12 12 sha256 = "0dpvih9gpiyh1ml22zi7hi6kslkilzby00z1p8x248idylldzs2n"; 13 13 }; 14 14 15 - buildInputs = with pkgs; [ libxl ]; 15 + buildInputs = [ libxl ]; 16 16 17 17 configureFlags = [ 18 18 "--with-excel" 19 - "--with-libxl-incdir=${pkgs.libxl}/include_c" 20 - "--with-libxl-libdir=${pkgs.libxl}/lib" 19 + "--with-libxl-incdir=${libxl}/include_c" 20 + "--with-libxl-libdir=${libxl}/lib" 21 21 ]; 22 22 23 23 meta.maintainers = lib.teams.php.members;
+3 -3
pkgs/development/php-packages/phpcbf/default.nix
··· 1 - { mkDerivation, fetchurl, pkgs, lib, php }: 1 + { mkDerivation, fetchurl, lib, php, makeWrapper }: 2 2 let 3 3 pname = "phpcbf"; 4 4 version = "3.5.8"; ··· 12 12 }; 13 13 14 14 phases = [ "installPhase" ]; 15 - nativeBuildInputs = [ pkgs.makeWrapper ]; 15 + nativeBuildInputs = [ makeWrapper ]; 16 16 17 17 installPhase = '' 18 18 mkdir -p $out/bin ··· 21 21 --add-flags "$out/libexec/phpcbf/phpcbf.phar" 22 22 ''; 23 23 24 - meta = with pkgs.lib; { 24 + meta = with lib; { 25 25 description = "PHP coding standard beautifier and fixer"; 26 26 license = licenses.bsd3; 27 27 homepage = "https://squizlabs.github.io/PHP_CodeSniffer/";
+3 -3
pkgs/development/php-packages/phpcs/default.nix
··· 1 - { mkDerivation, fetchurl, pkgs, lib, php }: 1 + { mkDerivation, fetchurl, makeWrapper, lib, php }: 2 2 let 3 3 pname = "phpcs"; 4 4 version = "3.5.8"; ··· 12 12 }; 13 13 14 14 phases = [ "installPhase" ]; 15 - nativeBuildInputs = [ pkgs.makeWrapper ]; 15 + nativeBuildInputs = [ makeWrapper ]; 16 16 17 17 installPhase = '' 18 18 mkdir -p $out/bin ··· 21 21 --add-flags "$out/libexec/phpcs/phpcs.phar" 22 22 ''; 23 23 24 - meta = with pkgs.lib; { 24 + meta = with lib; { 25 25 description = "PHP coding standard tool"; 26 26 license = licenses.bsd3; 27 27 homepage = "https://squizlabs.github.io/PHP_CodeSniffer/";
+4 -4
pkgs/development/php-packages/phpmd/default.nix
··· 1 - { mkDerivation, fetchurl, pkgs, lib, php }: 1 + { mkDerivation, fetchurl, makeWrapper, lib, php }: 2 2 let 3 3 pname = "phpmd"; 4 4 version = "2.8.2"; ··· 8 8 mkDerivation { 9 9 inherit pname version; 10 10 11 - src = pkgs.fetchurl { 11 + src = fetchurl { 12 12 url = "https://github.com/phpmd/phpmd/releases/download/${version}/phpmd.phar"; 13 13 sha256 = "1i8qgzxniw5d8zjpypalm384y7qfczapfq70xmg129laq6xiqlqb"; 14 14 }; 15 15 16 16 phases = [ "installPhase" ]; 17 - nativeBuildInputs = [ pkgs.makeWrapper ]; 17 + nativeBuildInputs = [ makeWrapper ]; 18 18 19 19 installPhase = '' 20 20 mkdir -p $out/bin ··· 23 23 --add-flags "$out/libexec/phpmd/phpmd.phar" 24 24 ''; 25 25 26 - meta = with pkgs.lib; { 26 + meta = with lib; { 27 27 description = "PHP code quality analyzer"; 28 28 license = licenses.bsd3; 29 29 homepage = "https://phpmd.org/";
+4 -4
pkgs/development/php-packages/phpstan/default.nix
··· 1 - { mkDerivation, fetchurl, pkgs, lib, php }: 1 + { mkDerivation, fetchurl, makeWrapper, lib, php }: 2 2 let 3 3 pname = "phpstan"; 4 4 version = "0.12.78"; ··· 6 6 mkDerivation { 7 7 inherit pname version; 8 8 9 - src = pkgs.fetchurl { 9 + src = fetchurl { 10 10 url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; 11 11 sha256 = "sha256-YPCh6HAVuFf2rJhUj/uzfqkWKN+Jd2iPfugSiTh65zc="; 12 12 }; 13 13 14 14 phases = [ "installPhase" ]; 15 - nativeBuildInputs = [ pkgs.makeWrapper ]; 15 + nativeBuildInputs = [ makeWrapper ]; 16 16 17 17 installPhase = '' 18 18 mkdir -p $out/bin ··· 21 21 --add-flags "$out/libexec/phpstan/phpstan.phar" 22 22 ''; 23 23 24 - meta = with pkgs.lib; { 24 + meta = with lib; { 25 25 description = "PHP Static Analysis Tool"; 26 26 longDescription = '' 27 27 PHPStan focuses on finding errors in your code without actually
+3 -3
pkgs/development/php-packages/psalm/default.nix
··· 1 - { mkDerivation, fetchurl, pkgs, lib, php }: 1 + { mkDerivation, fetchurl, makeWrapper, lib, php }: 2 2 let 3 3 pname = "psalm"; 4 4 version = "4.6.1"; ··· 12 12 }; 13 13 14 14 phases = [ "installPhase" ]; 15 - nativeBuildInputs = [ pkgs.makeWrapper ]; 15 + nativeBuildInputs = [ makeWrapper ]; 16 16 17 17 installPhase = '' 18 18 mkdir -p $out/bin ··· 21 21 --add-flags "$out/libexec/psalm/psalm.phar" 22 22 ''; 23 23 24 - meta = with pkgs.lib; { 24 + meta = with lib; { 25 25 description = "A static analysis tool for finding errors in PHP applications"; 26 26 license = licenses.mit; 27 27 homepage = "https://github.com/vimeo/psalm";
+3 -3
pkgs/development/php-packages/psysh/default.nix
··· 1 - { mkDerivation, fetchurl, pkgs, lib, php }: 1 + { mkDerivation, fetchurl, makeWrapper, lib, php }: 2 2 let 3 3 pname = "psysh"; 4 4 version = "0.10.4"; ··· 12 12 }; 13 13 14 14 phases = [ "installPhase" ]; 15 - nativeBuildInputs = [ pkgs.makeWrapper ]; 15 + nativeBuildInputs = [ makeWrapper ]; 16 16 17 17 installPhase = '' 18 18 mkdir -p $out/bin ··· 21 21 wrapProgram $out/bin/psysh --prefix PATH : "${lib.makeBinPath [ php ]}" 22 22 ''; 23 23 24 - meta = with pkgs.lib; { 24 + meta = with lib; { 25 25 description = "PsySH is a runtime developer console, interactive debugger and REPL for PHP."; 26 26 license = licenses.mit; 27 27 homepage = "https://psysh.org/";
+3 -3
pkgs/development/php-packages/rdkafka/default.nix
··· 1 - { buildPecl, lib, pkgs, pcre' }: 1 + { buildPecl, lib, rdkafka, pcre' }: 2 2 3 3 buildPecl { 4 4 pname = "rdkafka"; ··· 6 6 version = "5.0.0"; 7 7 sha256 = "sha256-Qy+6rkPczhdxFbDhcuzmUTLMPUXYZ0HaheDBhkh4FXs="; 8 8 9 - buildInputs = [ pkgs.rdkafka pcre' ]; 9 + buildInputs = [ rdkafka pcre' ]; 10 10 11 11 postPhpize = '' 12 12 substituteInPlace configure \ 13 - --replace 'SEARCH_PATH="/usr/local /usr"' 'SEARCH_PATH=${pkgs.rdkafka}' 13 + --replace 'SEARCH_PATH="/usr/local /usr"' 'SEARCH_PATH=${rdkafka}' 14 14 ''; 15 15 16 16 meta = with lib; {
+4 -4
pkgs/development/php-packages/smbclient/default.nix
··· 1 - { buildPecl, lib, pkgs }: 1 + { buildPecl, lib, samba, pkg-config }: 2 2 buildPecl { 3 3 pname = "smbclient"; 4 4 version = "1.0.5"; 5 5 sha256 = "sha256-cNvTa1qzYrlhuX4oNehXt+XKqmqfonyomW/usQdQQO0="; 6 6 7 7 # TODO: remove this when upstream merges a fix - https://github.com/eduardok/libsmbclient-php/pull/66 8 - LIBSMBCLIENT_INCDIR = "${pkgs.samba.dev}/include/samba-4.0"; 8 + LIBSMBCLIENT_INCDIR = "${samba.dev}/include/samba-4.0"; 9 9 10 - nativeBuildInputs = [ pkgs.pkg-config ]; 11 - buildInputs = [ pkgs.samba ]; 10 + nativeBuildInputs = [ pkg-config ]; 11 + buildInputs = [ samba ]; 12 12 13 13 meta.maintainers = lib.teams.php.members; 14 14 }
+3 -5
pkgs/development/php-packages/sqlsrv/default.nix
··· 1 - { buildPecl, lib, pkgs }: 1 + { stdenv, buildPecl, lib, unixODBC, libiconv }: 2 2 3 3 buildPecl { 4 4 pname = "sqlsrv"; ··· 7 7 sha256 = "1css440b4qrbblmcswd5wdr2v1rjxlj2iicbmvjq9fg81028w40a"; 8 8 9 9 buildInputs = [ 10 - pkgs.unixODBC 11 - ] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [ 12 - pkgs.libiconv 13 - ]; 10 + unixODBC 11 + ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; 14 12 15 13 meta.maintainers = lib.teams.php.members; 16 14 }
+3 -3
pkgs/development/php-packages/yaml/default.nix
··· 1 - { buildPecl, lib, pkgs }: 1 + { buildPecl, lib, pkg-config, libyaml }: 2 2 3 3 buildPecl { 4 4 pname = "yaml"; ··· 6 6 version = "2.2.1"; 7 7 sha256 = "sha256-4XrQTnUuJf0Jm93S350m3+8YPI0AxBebydei4cl9eBk="; 8 8 9 - configureFlags = [ "--with-yaml=${pkgs.libyaml}" ]; 9 + configureFlags = [ "--with-yaml=${libyaml}" ]; 10 10 11 - nativeBuildInputs = [ pkgs.pkg-config ]; 11 + nativeBuildInputs = [ pkg-config ]; 12 12 13 13 meta.maintainers = lib.teams.php.members; 14 14 }