about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorEmery Hemingway <ehmry@posteo.net>2021-12-04 14:36:05 +0000
committerehmry <ehmry@posteo.net>2021-12-17 10:52:32 +0000
commitcc5e2c9613fad64b37d798de8fb8ff53a93d3298 (patch)
tree7ac27e3a2b9e41f533a2a8d3c7d173d4ad4737ae /pkgs
parent5caed9dc0204ec7c25520acc40645d0a2c1df2e9 (diff)
xastir: 2.1.6 -> 2.1.8
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/misc/xastir/default.nix12
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/applications/misc/xastir/default.nix b/pkgs/applications/misc/xastir/default.nix
index 63240e0402fe5..294beb06c5bf8 100644
--- a/pkgs/applications/misc/xastir/default.nix
+++ b/pkgs/applications/misc/xastir/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config
 , curl, db, libgeotiff
 , libXpm, libXt, motif, pcre
 , perl, proj, rastermagick, shapelib
@@ -6,17 +6,21 @@
 
 stdenv.mkDerivation rec {
   pname = "xastir";
-  version = "2.1.6";
+  version = "2.1.8";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "Release-${version}";
-    sha256 = "0yrvwy6hlc73gzwrsrczflyymyz0k33hj991ajrd1vijq14m3n91";
+    hash = "sha256-hRe0KO1lWOv3hNNDMS70t+X1rxuhNlNKykmo4LEU+U0=";
   };
 
-  buildInputs = [
+  nativeBuildInputs = [
     autoreconfHook
+    pkg-config
+  ];
+
+  buildInputs = [
     curl db libgeotiff
     libXpm libXt motif pcre
     perl proj rastermagick shapelib
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f818fa5fc053e..bd66c98a810c9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -29406,7 +29406,7 @@ with pkgs;
   };
 
   xastir = callPackage ../applications/misc/xastir {
-    rastermagick = imagemagick;
+    rastermagick = imagemagick6;
     inherit (xorg) libXt;
   };