JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #309602 from lhanson/siril-update

Browse Source 
siril: 1.2.0 -> 1.2.1
This commit is contained in:
Peder Bergebakken Sundt 2024-05-13 01:34:41 +02:00 committed by GitHub
commit 3f0a745165
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/applications/science/astronomy/siril/default.nix
View File

@ -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 = ''