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

siril: fix build with glib-2.68 dependency (#122874)

Browse Source
This commit is contained in:
hjones2199 2021-05-13 14:03:29 -05:00 committed by GitHub
parent 18b1789e32
commit 036e234a66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 , git, criterion, gtk3, libconfig, gnuplot, opencv, json-glib
, fftwFloat, cfitsio, gsl, exiv2, librtprocess, wcslib, ffmpeg , fftwFloat, cfitsio, gsl, exiv2, librtprocess, wcslib, ffmpeg
, libraw, libtiff, libpng, libjpeg, libheif, ffms , libraw, libtiff, libpng, libjpeg, libheif, ffms, wrapGAppsHook
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -15,6 +15,14 @@ stdenv.mkDerivation rec {
sha256 = "0h3slgpj6zdc0rwmyr9zb0vgf53283hpwb7h26skdswmggsk90i5"; 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 = [ nativeBuildInputs = [
meson ninja pkg-config git criterion wrapGAppsHook meson ninja pkg-config git criterion wrapGAppsHook
]; ];