xastir: switch from imagemagick6 to graphicsmagick

This removes the need for the CVE addled imagemagick6. This approach
is similar to what is done on the BSDs:

https://github.com/openbsd/ports/blob/master/comms/xastir/Makefile
This commit is contained in:
Aaron Bieber 2023-07-17 10:19:42 -06:00 committed by Emery Hemingway
parent 184dfbc8a1
commit 4a716c50fe
2 changed files with 3 additions and 5 deletions

View File

@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config
, curl, db, libgeotiff
, xorg, motif, pcre
, perl, proj, rastermagick, shapelib
, perl, proj, graphicsmagick, shapelib
, libax25
}:
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
buildInputs = [
curl db libgeotiff
xorg.libXpm xorg.libXt motif pcre
perl proj rastermagick shapelib
perl proj graphicsmagick shapelib
libax25
];

View File

@ -35955,9 +35955,7 @@ with pkgs;
xaos = libsForQt5.callPackage ../applications/graphics/xaos { };
xastir = callPackage ../applications/misc/xastir {
rastermagick = imagemagick6;
};
xastir = callPackage ../applications/misc/xastir { };
xautomation = callPackage ../tools/X11/xautomation { };