From ce50646e63d9fec04e364eb747615cf12eebb274 Mon Sep 17 00:00:00 2001
From: Daniel Siepmann <coding@daniel-siepmann.de>
Date: Tue, 23 Jul 2024 14:46:07 +0200
Subject: [PATCH] Add image handling support in nix shell.

---
 Documentation/Changelog/4.1.0.rst             | 27 +++++++++++++++++++
 .../Functional/AbstractFunctionalTestCase.php |  6 ++---
 ext_emconf.php                                |  2 +-
 shell.nix                                     |  2 ++
 4 files changed, 33 insertions(+), 4 deletions(-)
 create mode 100644 Documentation/Changelog/4.1.0.rst

diff --git a/Documentation/Changelog/4.1.0.rst b/Documentation/Changelog/4.1.0.rst
new file mode 100644
index 00000000..0685fa41
--- /dev/null
+++ b/Documentation/Changelog/4.1.0.rst
@@ -0,0 +1,27 @@
+4.1.9
+=====
+
+Breaking
+--------
+
+Nothing
+
+Features
+--------
+
+Nothing
+
+Fixes
+-----
+
+Nothing
+
+Tasks
+-----
+
+* Add image handling support in nix shell.
+
+Deprecation
+-----------
+
+Nothing
diff --git a/Tests/Functional/AbstractFunctionalTestCase.php b/Tests/Functional/AbstractFunctionalTestCase.php
index 41b26837..72ccb0eb 100644
--- a/Tests/Functional/AbstractFunctionalTestCase.php
+++ b/Tests/Functional/AbstractFunctionalTestCase.php
@@ -79,9 +79,9 @@ protected function setUp(): void
             ],
             'GFX' => [
                 'processor_enabled' => true,
-                'processor_path' => '/usr/bin/',
-                'processor_path_lzw' => '/usr/bin/',
-                'processor' => 'ImageMagick',
+                'processor_path' => getenv('GRAPHICSMAGICK_PATH') ?: '/usr/bin/',
+                'processor_path_lzw' => getenv('GRAPHICSMAGICK_PATH') ?: '/usr/bin/',
+                'processor' => 'GraphicsMagick',
             ],
         ]);
 
diff --git a/ext_emconf.php b/ext_emconf.php
index f763d4b5..028c3cfe 100644
--- a/ext_emconf.php
+++ b/ext_emconf.php
@@ -9,7 +9,7 @@
     'author' => 'Dirk Koritnik, Daniel Siepmann',
     'author_email' => 'koritnik@werkraum-media.de, coding@daniel-siepmann.de',
     'state' => 'stable',
-    'version' => '4.0.1',
+    'version' => '4.1.0',
     'constraints' => [
         'depends' => [
             'typo3' => '',
diff --git a/shell.nix b/shell.nix
index 9ebd4666..70c6e7df 100644
--- a/shell.nix
+++ b/shell.nix
@@ -129,6 +129,8 @@ in pkgs.mkShell {
     composer
   ];
 
+  GRAPHICSMAGICK_PATH = pkgs.lib.makeBinPath [ pkgs.graphicsmagick ] + "/";
+
   shellHook = ''
     export typo3DatabaseDriver=pdo_sqlite
   '';