ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-29 06:45:54 +03:00
Code Issues Projects Releases Wiki Activity

golden-cheetah: fix build with bison 3.7

Browse Source 
Currently, GoldenCheetah fails to build with Bison >=3.7 (which we use
for some time).

This applies the commit from https://github.com/GoldenCheetah/GoldenCheetah/pull/3590.

Upstream issue: https://github.com/GoldenCheetah/GoldenCheetah/issues/3586
This commit is contained in:
Florian Klink 2020-10-10 16:43:12 +02:00
parent 746a42a15c
commit a73c1259d1
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/applications/misc/golden-cheetah/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, mkDerivation
{ stdenv, fetchFromGitHub, fetchpatch, mkDerivation
, qtbase, qtsvg, qtserialport, qtwebengine, qtmultimedia, qttools
, qtconnectivity, qtcharts, libusb-compat-0_1
, yacc, flex, zlib, qmake, makeDesktopItem, makeWrapper
@ -31,6 +31,15 @@ in mkDerivation rec {
];
nativeBuildInputs = [ flex makeWrapper qmake yacc ];
patches = [
# allow building with bison 3.7
# PR at https://github.com/GoldenCheetah/GoldenCheetah/pull/3590
(fetchpatch {
url = "https://github.com/GoldenCheetah/GoldenCheetah/commit/e1f42f8b3340eb4695ad73be764332e75b7bce90.patch";
sha256 = "1h0y9vfji5jngqcpzxna5nnawxs77i1lrj44w8a72j0ah0sznivb";
})
];
NIX_LDFLAGS = "-lz";
qtWrapperArgs = [ "--set LD_LIBRARY_PATH ${zlib.out}/lib" ];