diff options
| author | hjones2199 <hjones2199@gmail.com> | 2021-05-13 14:03:29 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-13 15:03:29 -0400 |
| commit | 036e234a6651938f66ca1f05ec6b2357fcb7681b (patch) | |
| tree | fc96c1c0916b57b77a2642bc1ed44036949607f6 /pkgs/applications/science/astronomy | |
| parent | 18b1789e32b24250d6366da9524800b614ce7773 (diff) | |
| download | nixpkgs-036e234a6651938f66ca1f05ec6b2357fcb7681b.tar nixpkgs-036e234a6651938f66ca1f05ec6b2357fcb7681b.tar.gz nixpkgs-036e234a6651938f66ca1f05ec6b2357fcb7681b.tar.bz2 nixpkgs-036e234a6651938f66ca1f05ec6b2357fcb7681b.tar.lz nixpkgs-036e234a6651938f66ca1f05ec6b2357fcb7681b.tar.xz nixpkgs-036e234a6651938f66ca1f05ec6b2357fcb7681b.tar.zst nixpkgs-036e234a6651938f66ca1f05ec6b2357fcb7681b.zip | |
siril: fix build with glib-2.68 dependency (#122874)
Diffstat (limited to 'pkgs/applications/science/astronomy')
| -rw-r--r-- | pkgs/applications/science/astronomy/siril/default.nix | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/applications/science/astronomy/siril/default.nix b/pkgs/applications/science/astronomy/siril/default.nix index e51d181266a..fd49957aa35 100644 --- a/pkgs/applications/science/astronomy/siril/default.nix +++ b/pkgs/applications/science/astronomy/siril/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, fetchFromGitLab, pkg-config, meson, ninja, wrapGAppsHook +{ lib, stdenv, fetchFromGitLab, fetchpatch, pkg-config, meson, ninja , git, criterion, gtk3, libconfig, gnuplot, opencv, json-glib , fftwFloat, cfitsio, gsl, exiv2, librtprocess, wcslib, ffmpeg -, libraw, libtiff, libpng, libjpeg, libheif, ffms +, libraw, libtiff, libpng, libjpeg, libheif, ffms, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -15,6 +15,14 @@ stdenv.mkDerivation rec { sha256 = "0h3slgpj6zdc0rwmyr9zb0vgf53283hpwb7h26skdswmggsk90i5"; }; + patches = [ + # Backport fix for broken build on glib-2.68 + (fetchpatch { + url = "https://gitlab.com/free-astro/siril/-/commit/d319fceca5b00f156e1c5e3512d3ac1f41beb16a.diff"; + sha256 = "00lq9wq8z48ly3hmkgzfqbdjaxr0hzyl2qwbj45bdnxfwqragh5m"; + }) + ]; + nativeBuildInputs = [ meson ninja pkg-config git criterion wrapGAppsHook ]; |