From 1345e5b7634da245238a909f104b0de35db63874 Mon Sep 17 00:00:00 2001
From: talyz <kim.lindberger@gmail.com>
Date: Fri, 3 Apr 2020 18:18:36 +0200
Subject: php: Add withExtensions as a simpler alternative to buildEnv

---
 pkgs/development/interpreters/php/default.nix | 30 +++++++++++++--------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 2558cf2c4b5d..0df371713b67 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -193,7 +193,7 @@ let
             inherit (php) dev;
             nativeBuildInputs = [ makeWrapper ];
             passthru = {
-              inherit buildEnv;
+              inherit buildEnv withExtensions;
               inherit (php-packages) packages extensions;
             };
             paths = [ php ];
@@ -207,10 +207,12 @@ let
               fi
             '';
           };
+
+      withExtensions = extensions: buildEnv { inherit extensions; };
     in
       php.overrideAttrs (_: {
         passthru = {
-          inherit buildEnv;
+          inherit buildEnv withExtensions;
           inherit (php-packages) packages extensions;
         };
       });
@@ -242,19 +244,17 @@ let
     selfWithExtensions = php74;
   };
 
-  defaultPhpExtensions = {
-    extensions = extensions: with extensions; ([
-      bcmath calendar curl ctype dom exif fileinfo filter ftp gd
-      gettext gmp iconv intl json ldap mbstring mysqli mysqlnd opcache
-      openssl pcntl pdo pdo_mysql pdo_odbc pdo_pgsql pdo_sqlite pgsql
-      posix readline session simplexml sockets soap sodium sqlite3
-      tokenizer xmlreader xmlwriter zip zlib
-    ] ++ lib.optionals (!stdenv.isDarwin) [ imap ]);
-  };
-
-  php74 = php74base.buildEnv defaultPhpExtensions;
-  php73 = php73base.buildEnv defaultPhpExtensions;
-  php72 = php72base.buildEnv defaultPhpExtensions;
+  defaultPhpExtensions = extensions: with extensions; ([
+    bcmath calendar curl ctype dom exif fileinfo filter ftp gd
+    gettext gmp iconv intl json ldap mbstring mysqli mysqlnd opcache
+    openssl pcntl pdo pdo_mysql pdo_odbc pdo_pgsql pdo_sqlite pgsql
+    posix readline session simplexml sockets soap sodium sqlite3
+    tokenizer xmlreader xmlwriter zip zlib
+  ] ++ lib.optionals (!stdenv.isDarwin) [ imap ]);
+
+  php74 = php74base.withExtensions defaultPhpExtensions;
+  php73 = php73base.withExtensions defaultPhpExtensions;
+  php72 = php72base.withExtensions defaultPhpExtensions;
 
 in {
   inherit php72base php73base php74base php72 php73 php74;
-- 
cgit 1.4.1