diff options
| author | markuskowa <markus.kowalewski@gmail.com> | 2022-06-08 14:36:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-08 14:36:23 +0200 |
| commit | b2841450bc764be94b13c47d2eafe3f113e31f50 (patch) | |
| tree | 3e616e370943b4c2afd12d6d970c0bd1d53c41da /pkgs | |
| parent | 67b282f040c69ef3cc2c6c378c049a1539c22493 (diff) | |
| parent | 2f9d125d5820ead05c19aa2eeb1a695451958b64 (diff) | |
Merge pull request #176861 from trofi/fix-fno-common-for-gpredict
gpredict: pull upstream fix for -fno-common toolchains
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/science/astronomy/gpredict/default.nix | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/applications/science/astronomy/gpredict/default.nix b/pkgs/applications/science/astronomy/gpredict/default.nix index 3f82ff7b52a87..1fd2d4ac2adce 100644 --- a/pkgs/applications/science/astronomy/gpredict/default.nix +++ b/pkgs/applications/science/astronomy/gpredict/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, intltool +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, intltool , gtk3, glib, curl, goocanvas2, gpsd , hamlib, wrapGAppsHook }: @@ -14,6 +14,16 @@ in stdenv.mkDerivation { sha256 = "0hwf97kng1zy8rxyglw04x89p0bg07zq30hgghm20yxiw2xc8ng7"; }; + patches = [ + # Pull upstream fix for -fno-common toolchains: + # https://github.com/csete/gpredict/issues/195 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/csete/gpredict/commit/c565bb3d48777bfe17114b5d01cd81150521f056.patch"; + sha256 = "1jhy9hpqlachq32bkij60q3dxkgi1kkr80rm29jjxqpmambf406a"; + }) + ]; + nativeBuildInputs = [ pkg-config intltool wrapGAppsHook ]; buildInputs = [ curl glib gtk3 goocanvas2 gpsd hamlib ]; |