From 76fe809b595b408206f910c4c23e19e6191a6662 Mon Sep 17 00:00:00 2001
From: Lyle Hanson <lyle2.0@gmail.com>
Date: Mon, 6 May 2024 12:38:57 -0400
Subject: [PATCH] siril: 1.2.0 -> 1.2.1

Upgrade to latest upstream release.

Add support for libcurl to enable features such as photometric color
calibration.
---
 .../science/astronomy/siril/default.nix       | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/science/astronomy/siril/default.nix b/pkgs/applications/science/astronomy/siril/default.nix
index f039d056ec67..569d53717254 100644
--- a/pkgs/applications/science/astronomy/siril/default.nix
+++ b/pkgs/applications/science/astronomy/siril/default.nix
@@ -1,28 +1,21 @@
-{ lib, stdenv, fetchFromGitLab, fetchpatch, pkg-config, meson, ninja, cmake
+{ lib, stdenv, fetchFromGitLab, pkg-config, meson, ninja, cmake
 , git, criterion, gtk3, libconfig, gnuplot, opencv, json-glib
 , fftwFloat, cfitsio, gsl, exiv2, librtprocess, wcslib, ffmpeg
 , libraw, libtiff, libpng, libjpeg, libheif, ffms, wrapGAppsHook3
+, curl
 }:
 
 stdenv.mkDerivation rec {
   pname = "siril";
-  version = "1.2.0";
+  version = "1.2.1";
 
   src = fetchFromGitLab {
     owner = "free-astro";
     repo = "siril";
     rev = version;
-    hash = "sha256-lCoFQ7z6cZbyNPEm5s40DNdvTwFonHK3KCd8RniqQWs=";
+    hash = "sha256-njvByA8nbG3qHKfv8eX20TrIhngVI0nzIHmhYIN6htE=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "siril-1.2-exiv2-0.28.patch";
-      url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sci-astronomy/siril/files/siril-1.2-exiv2-0.28.patch?id=002882203ad6a2b08ce035a18b95844a9f4b85d0";
-      hash = "sha256-R1yslW6hzvJHKo0/IqBxkCuqcX6VrdRSz68gpAExxVE=";
-    })
-  ];
-
   nativeBuildInputs = [
     meson ninja cmake pkg-config git criterion wrapGAppsHook3
   ];
@@ -30,14 +23,16 @@ stdenv.mkDerivation rec {
   buildInputs = [
     gtk3 cfitsio gsl exiv2 gnuplot opencv fftwFloat librtprocess wcslib
     libconfig libraw libtiff libpng libjpeg libheif ffms ffmpeg json-glib
+    curl
   ];
 
   # Necessary because project uses default build dir for flatpaks/snaps
   dontUseMesonConfigure = true;
   dontUseCmakeConfigure = true;
 
+  # Meson fails to find libcurl unless the option is specifically enabled
   configureScript = ''
-    ${meson}/bin/meson --buildtype release nixbld .
+    ${meson}/bin/meson setup -Denable-libcurl=yes --buildtype release nixbld .
   '';
 
   postConfigure = ''