From 1daff9de4ac61c22684bb10bc6a3dd9b325b890f Mon Sep 17 00:00:00 2001 From: Daniel Siepmann Date: Tue, 23 Jul 2024 14:46:07 +0200 Subject: [PATCH] Add image handling support in nix shell. --- Documentation/Changelog/3.9.0.rst | 2 +- Tests/Functional/AbstractFunctionalTestCase.php | 6 +++--- shell.nix | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Documentation/Changelog/3.9.0.rst b/Documentation/Changelog/3.9.0.rst index 637af2e..9e561f1 100644 --- 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 index 7095d73..ffd0f2f 100644 --- a/Tests/Functional/AbstractFunctionalTestCase.php +++ b/Tests/Functional/AbstractFunctionalTestCase.php @@ -76,9 +76,9 @@ abstract class AbstractFunctionalTestCase extends FunctionalTestCase ], '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 index 90b74d5..bd0a2cc 100644 --- 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)"