From 4a716c50feec750263bee793ceb571be536dff19 Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Mon, 17 Jul 2023 10:19:42 -0600 Subject: [PATCH] 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 --- pkgs/applications/misc/xastir/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/xastir/default.nix b/pkgs/applications/misc/xastir/default.nix index 899468fbb557..abb5d0b96096 100644 --- a/pkgs/applications/misc/xastir/default.nix +++ b/pkgs/applications/misc/xastir/default.nix @@ -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 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a3ed50c6ff5b..e11874aff7d0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { };