Commit 4a716c50 authored by Aaron Bieber's avatar Aaron Bieber Committed by Emery Hemingway
Browse files

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
parent 184dfbc8

pkgs/applications/misc/xastir/default.nix

+2 −2
Original line number Diff line number Diff line 
{ 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

  ];

pkgs/top-level/all-packages.nix

+1 −3
Original line number Diff line number Diff line
@@ -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 { };