From 119395a48cc4d214f1674b8a2d5ea0e1f2f4963d Mon Sep 17 00:00:00 2001
From: Daniel Siepmann <coding@daniel-siepmann.de>
Date: Tue, 5 Mar 2024 19:39:12 +0100
Subject: [PATCH] Streamline shell.nix

---
 shell.nix | 33 ++++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/shell.nix b/shell.nix
index 599e51f..be95bb6 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,11 +1,26 @@
-{ pkgs ? import <nixpkgs> { } }:
+{
+  pkgs ? import <nixpkgs> { }
+  ,phps ? import <phps>
+}:
 
 let
+  php = phps.packages.x86_64-linux.php83.buildEnv {
+    extensions = { enabled, all }: enabled ++ (with all; [
+      xdebug
+    ]);
+
+    extraConfig = ''
+      xdebug.mode = debug
+      memory_limit = 4G
+    '';
+  };
+  inherit(php.packages) composer;
+
   projectInstall = pkgs.writeShellApplication {
     name = "project-install";
     runtimeInputs = [
-      pkgs.php83
-      pkgs.php83Packages.composer
+      php
+      composer
       projectTest
     ];
     text = ''
@@ -16,7 +31,7 @@ let
   projectTest = pkgs.writeShellApplication {
     name = "project-test";
     runtimeInputs = [
-      pkgs.php83
+      php
     ];
     text = ''
       ./vendor/bin/phpunit
@@ -26,7 +41,7 @@ let
   projectRun = pkgs.writeShellApplication {
     name = "project-run";
     runtimeInputs = [
-      pkgs.php83
+      php
     ];
     text = ''
       php -S 127.0.0.1:8080 -t public
@@ -38,8 +53,8 @@ let
       pkgs.git
       pkgs.rsync
       # Missing ssh
-      pkgs.php83
-      pkgs.php83Packages.composer
+      php
+      composer
       projectInstall
     ];
     text = ''
@@ -71,8 +86,8 @@ let
 in pkgs.mkShellNoCC {
   name = "Fediverse-Feed-Wrappers";
   buildInputs = [
-    pkgs.php83
-    pkgs.php83Packages.composer
+    php
+    composer
     projectInstall
     projectTest
     projectRun