From 7a2727154913a70f3c7102e608a608a3e7c70672 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Sat, 27 Dec 2025 16:52:01 +0100 Subject: [PATCH 1/3] phpPackages.imagick: fix cross compilation --- pkgs/development/php-packages/imagick/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/imagick/default.nix b/pkgs/development/php-packages/imagick/default.nix index bea439c59417..147f65af6693 100644 --- a/pkgs/development/php-packages/imagick/default.nix +++ b/pkgs/development/php-packages/imagick/default.nix @@ -1,11 +1,9 @@ { buildPecl, - fetchpatch, lib, imagemagick, pkg-config, pcre2, - php, }: buildPecl { @@ -15,7 +13,11 @@ buildPecl { sha256 = "sha256-OjWHwKUkwX0NrZZzoWC5DNd26DaDhHThc7VJ7YZDUu4="; configureFlags = [ "--with-imagick=${imagemagick.dev}" ]; + + depsBuildBuild = [ pkg-config ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ pcre2 ]; meta = { From e7a4c6ced979298c8c97d84a8596736e5e9752a3 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Sat, 27 Dec 2025 20:06:15 +0100 Subject: [PATCH 2/3] imagemagick: fix cross compile --- pkgs/by-name/im/imagemagick/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/im/imagemagick/package.nix b/pkgs/by-name/im/imagemagick/package.nix index 0f4fef3d4a76..7a1de6869e9d 100644 --- a/pkgs/by-name/im/imagemagick/package.nix +++ b/pkgs/by-name/im/imagemagick/package.nix @@ -174,7 +174,7 @@ stdenv.mkDerivation (finalAttrs: { configDestination=($out/share/ImageMagick-*) grep -v '/nix/store' $dev/lib/ImageMagick-*/config-Q16HDRI/configure.xml > $configDestination/configure.xml for file in "$dev"/bin/*-config; do - substituteInPlace "$file" --replace pkg-config \ + substituteInPlace "$file" --replace-fail "$PKG_CONFIG" \ "PKG_CONFIG_PATH='$dev/lib/pkgconfig' '$(command -v $PKG_CONFIG)'" done '' From 624d04074e6ebcfa7889c33b1552a7f8d20ead7f Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Thu, 29 Jan 2026 12:56:29 +0100 Subject: [PATCH 3/3] phpPackages.imagick: cleanup --- pkgs/development/php-packages/imagick/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/php-packages/imagick/default.nix b/pkgs/development/php-packages/imagick/default.nix index 147f65af6693..8b1e40cc033c 100644 --- a/pkgs/development/php-packages/imagick/default.nix +++ b/pkgs/development/php-packages/imagick/default.nix @@ -10,7 +10,7 @@ buildPecl { pname = "imagick"; version = "3.8.1"; - sha256 = "sha256-OjWHwKUkwX0NrZZzoWC5DNd26DaDhHThc7VJ7YZDUu4="; + hash = "sha256-OjWHwKUkwX0NrZZzoWC5DNd26DaDhHThc7VJ7YZDUu4="; configureFlags = [ "--with-imagick=${imagemagick.dev}" ];