Add image handling support in nix shell.

werkraum-media · Jul 23, 2024 · 1daff9d · 1daff9d
1 parent af8a50d
commit 1daff9d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/Documentation/Changelog/3.9.0.rst b/Documentation/Changelog/3.9.0.rst
@@ -28,7 +28,7 @@ Nothing
 Tasks
 -----
 
-Nothing
+* Add image handling support in nix shell.
 
 Deprecation
 -----------

diff --git a/Tests/Functional/AbstractFunctionalTestCase.php b/Tests/Functional/AbstractFunctionalTestCase.php
@@ -76,9 +76,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' => getenv('GRAPHICSMAGICK_PATH') ? 'GraphicsMagick' : 'ImageMagick',
             ],
             'SC_OPTIONS' => [
                 'Core/TypoScript/TemplateService' => [

diff --git a/shell.nix b/shell.nix
@@ -129,6 +129,8 @@ in pkgs.mkShell {
     composer
   ];
 
+  GRAPHICSMAGICK_PATH = pkgs.lib.makeBinPath [ pkgs.graphicsmagick ] + "/";
+
   shellHook = ''
     export PROJECT_ROOT="$(pwd)"