From f5efe3768a56d98bca4ea26c76c3df6ab1e5b89a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 7 Apr 2024 22:54:12 -0700 Subject: [PATCH 1/2] imagemagick: 7.1.1-29 -> 7.1.1-30 Diff: https://github.com/ImageMagick/ImageMagick/compare/7.1.1-29...7.1.1-30 Changelog: https://github.com/ImageMagick/Website/blob/main/ChangeLog.md --- pkgs/applications/graphics/ImageMagick/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 568a8a0ac02e..a42ab93900cb 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -50,13 +50,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "imagemagick"; - version = "7.1.1-29"; + version = "7.1.1-30"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = finalAttrs.version; - hash = "sha256-W9WbHzmTa0dA9+mOxXu88qmN1mO9ORaH0Nj6r2s1Q+E="; + hash = "sha256-btXl1J/WjV+5BZibgUzylVmBrhR3KBK/ZSbP0B2fM5c="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big From e748b3a37e2f0bcb58952e81a6ae7335eff4499f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 8 Apr 2024 08:38:45 -0700 Subject: [PATCH 2/2] giflib: don't build HTML documentation --- pkgs/development/libraries/giflib/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/giflib/default.nix b/pkgs/development/libraries/giflib/default.nix index a73d12061250..9c4bcf82afe3 100644 --- a/pkgs/development/libraries/giflib/default.nix +++ b/pkgs/development/libraries/giflib/default.nix @@ -4,7 +4,6 @@ , fetchpatch , fixDarwinDylibNames , pkgsStatic -, imagemagick_light }: stdenv.mkDerivation rec { @@ -29,9 +28,7 @@ stdenv.mkDerivation rec { ./mingw-install-exes.patch ]; - nativeBuildInputs = [ - imagemagick_light - ] ++ lib.optionals stdenv.isDarwin [ + nativeBuildInputs = lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; @@ -39,7 +36,11 @@ stdenv.mkDerivation rec { "PREFIX=${builtins.placeholder "out"}" ]; - postPatch = lib.optionalString stdenv.hostPlatform.isStatic '' + postPatch = '' + # we don't want to build HTML documentation + substituteInPlace doc/Makefile \ + --replace-fail "all: allhtml manpages" "all: manpages" + '' + lib.optionalString stdenv.hostPlatform.isStatic '' # Upstream build system does not support NOT building shared libraries. sed -i '/all:/ s/$(LIBGIFSO)//' Makefile sed -i '/all:/ s/$(LIBUTILSO)//' Makefile