pyrox.dev
Merge pull request #302606 from dotlambda/imagemagick
imagemagick: 7.1.1-29 -> 7.1.1-30
authored by Robert Schütz and committed by GitHub 1fff08d1 f4442639
+2
-2
pkgs/applications/graphics/ImageMagick/default.nix
+2
-2
pkgs/applications/graphics/ImageMagick/default.nix
···
50
50
51
51
stdenv.mkDerivation (finalAttrs: {
52
52
pname = "imagemagick";
53
-
version = "7.1.1-29";
53
+
version = "7.1.1-30";
54
54
55
55
src = fetchFromGitHub {
56
56
owner = "ImageMagick";
57
57
repo = "ImageMagick";
58
58
rev = finalAttrs.version;
59
-
hash = "sha256-W9WbHzmTa0dA9+mOxXu88qmN1mO9ORaH0Nj6r2s1Q+E=";
59
+
hash = "sha256-btXl1J/WjV+5BZibgUzylVmBrhR3KBK/ZSbP0B2fM5c=";
60
60
};
61
61
62
62
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
+6
-5
pkgs/development/libraries/giflib/default.nix
+6
-5
pkgs/development/libraries/giflib/default.nix
···
4
4
, fetchpatch
5
5
, fixDarwinDylibNames
6
6
, pkgsStatic
7
-
, imagemagick_light
8
7
}:
9
8
10
9
stdenv.mkDerivation rec {
···
29
28
./mingw-install-exes.patch
30
29
];
31
30
32
-
nativeBuildInputs = [
33
-
imagemagick_light
34
-
] ++ lib.optionals stdenv.isDarwin [
31
+
nativeBuildInputs = lib.optionals stdenv.isDarwin [
35
32
fixDarwinDylibNames
36
33
];
37
34
···
39
36
"PREFIX=${builtins.placeholder "out"}"
40
37
];
41
38
42
-
postPatch = lib.optionalString stdenv.hostPlatform.isStatic ''
39
+
postPatch = ''
40
+
# we don't want to build HTML documentation
41
+
substituteInPlace doc/Makefile \
42
+
--replace-fail "all: allhtml manpages" "all: manpages"
43
+
'' + lib.optionalString stdenv.hostPlatform.isStatic ''
43
44
# Upstream build system does not support NOT building shared libraries.
44
45
sed -i '/all:/ s/$(LIBGIFSO)//' Makefile
45
46
sed -i '/all:/ s/$(LIBUTILSO)//' Makefile