diff options
| author | Florian Klink <flokli@flokli.de> | 2020-10-10 16:43:12 +0200 |
|---|---|---|
| committer | Florian Klink <flokli@flokli.de> | 2020-10-10 16:46:00 +0200 |
| commit | a73c1259d13b42bf3410cce5b6d7270d4cbd011f (patch) | |
| tree | bbb8ff528f397d90b144ebb1113569d6d604b413 /pkgs/applications/misc/golden-cheetah | |
| parent | 746a42a15c59e7d4abf4d53f65fd94e049cc6d58 (diff) | |
| download | nixpkgs-a73c1259d13b42bf3410cce5b6d7270d4cbd011f.tar nixpkgs-a73c1259d13b42bf3410cce5b6d7270d4cbd011f.tar.gz nixpkgs-a73c1259d13b42bf3410cce5b6d7270d4cbd011f.tar.bz2 nixpkgs-a73c1259d13b42bf3410cce5b6d7270d4cbd011f.tar.lz nixpkgs-a73c1259d13b42bf3410cce5b6d7270d4cbd011f.tar.xz nixpkgs-a73c1259d13b42bf3410cce5b6d7270d4cbd011f.tar.zst nixpkgs-a73c1259d13b42bf3410cce5b6d7270d4cbd011f.zip | |
golden-cheetah: fix build with bison 3.7
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
Diffstat (limited to 'pkgs/applications/misc/golden-cheetah')
| -rw-r--r-- | pkgs/applications/misc/golden-cheetah/default.nix | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix index 3eaefd66395..1673d4bd133 100644 --- a/pkgs/applications/misc/golden-cheetah/default.nix +++ b/pkgs/applications/misc/golden-cheetah/default.nix @@ -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" ]; |