From 1da61cd562558a86f8ae22f16971090d940605a6 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Thu, 3 Oct 2024 22:23:11 +0100
Subject: [PATCH] survex: 1.4.3 -> 1.4.11

Includes fixes for FFmpeg 7.
---
 pkgs/applications/misc/survex/default.nix | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/misc/survex/default.nix b/pkgs/applications/misc/survex/default.nix
index bfb79fd10b930..a74d7e424e886 100644
--- a/pkgs/applications/misc/survex/default.nix
+++ b/pkgs/applications/misc/survex/default.nix
@@ -13,6 +13,7 @@
 , perl
 , pkg-config
 , proj
+, gdal
 , python3
 , wrapGAppsHook3
 , wxGTK32
@@ -20,21 +21,13 @@
 
 stdenv.mkDerivation rec {
   pname = "survex";
-  version = "1.4.3";
+  version = "1.4.11";
 
   src = fetchurl {
     url = "https://survex.com/software/${version}/${pname}-${version}.tar.gz";
-    hash = "sha256-7NtGTe9xNRPEvG9fQ2fC6htQLEMHfqGmBM2ezhi6oNM=";
+    hash = "sha256-Q+86sDfU3zYhRhnnO2rfzwmF3CmWPYcIf2VeQctIZ7Y=";
   };
 
-  patches = [
-    # Fix cavern.tst to work with SOURCE_DATE_EPOCH set
-    (fetchpatch {
-      url = "https://github.com/ojwb/survex/commit/b1200a60be7bdea20ffebbd8bb15386041727fa6.patch";
-      hash = "sha256-OtFjqpU+u8XGy+PAHg2iea++b681p/Kl8YslisBs4sA=";
-    })
-  ];
-
   nativeBuildInputs = [
     perl
     pkg-config
@@ -46,6 +39,7 @@ stdenv.mkDerivation rec {
     ffmpeg
     glib
     proj
+    gdal
     wxGTK32
   ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
     Carbon