diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-10-01 00:16:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-01 00:16:35 +0200 |
| commit | 991ea4b41595021432f51d59cdca978899d5447b (patch) | |
| tree | c0b162c0161a9b85f309000102dac8e4949b734d /pkgs | |
| parent | 748bc1d2012b1e55b6653dcf6c7e0ab74b2c8c0c (diff) | |
| parent | 032719d0c58e607213638ca35af797a06fb8979d (diff) | |
| download | nixpkgs-991ea4b41595021432f51d59cdca978899d5447b.tar nixpkgs-991ea4b41595021432f51d59cdca978899d5447b.tar.gz nixpkgs-991ea4b41595021432f51d59cdca978899d5447b.tar.bz2 nixpkgs-991ea4b41595021432f51d59cdca978899d5447b.tar.lz nixpkgs-991ea4b41595021432f51d59cdca978899d5447b.tar.xz nixpkgs-991ea4b41595021432f51d59cdca978899d5447b.tar.zst nixpkgs-991ea4b41595021432f51d59cdca978899d5447b.zip | |
Merge pull request #258269 from wegank/siril-bump
siril: 1.0.6 -> 1.2.0
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/science/astronomy/siril/default.nix | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/pkgs/applications/science/astronomy/siril/default.nix b/pkgs/applications/science/astronomy/siril/default.nix index db0411f1337..255927d893d 100644 --- a/pkgs/applications/science/astronomy/siril/default.nix +++ b/pkgs/applications/science/astronomy/siril/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, pkg-config, meson, ninja +{ lib, stdenv, fetchFromGitLab, fetchpatch, 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, wrapGAppsHook @@ -6,17 +6,25 @@ stdenv.mkDerivation rec { pname = "siril"; - version = "1.0.6"; + version = "1.2.0"; src = fetchFromGitLab { owner = "free-astro"; - repo = pname; + repo = "siril"; rev = version; - sha256 = "sha256-KFCA3fUMVFHmh1BdKed5/dkq0EeYcmoWec97WX9ZHUc="; + hash = "sha256-lCoFQ7z6cZbyNPEm5s40DNdvTwFonHK3KCd8RniqQWs="; }; + 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 pkg-config git criterion wrapGAppsHook + meson ninja cmake pkg-config git criterion wrapGAppsHook ]; buildInputs = [ @@ -26,6 +34,7 @@ stdenv.mkDerivation rec { # Necessary because project uses default build dir for flatpaks/snaps dontUseMesonConfigure = true; + dontUseCmakeConfigure = true; configureScript = '' ${meson}/bin/meson --buildtype release nixbld . |