uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
|
|
@ -0,0 +1,63 @@
|
|||
From 8befa137776786829508f23dd33ab37e2b95a895 Mon Sep 17 00:00:00 2001
|
||||
From: Poncho <poncho@spahan.ch>
|
||||
Date: Mon, 7 Sep 2020 09:39:49 +0200
|
||||
Subject: [PATCH] Fix building with bison 3.7
|
||||
|
||||
Bison 3.7 changes how header files are included [1][2], in that instead of
|
||||
copying and inserting the contents of a file, the file itself is included
|
||||
(by default as '"basename.h"').
|
||||
|
||||
[1] https://lists.gnu.org/archive/html/info-gnu/2020-07/msg00006.html
|
||||
[2] https://www.gnu.org/software/bison/manual/html_node/_0025define-Summary.html
|
||||
|
||||
Close: https://github.com/GoldenCheetah/GoldenCheetah/issues/3586
|
||||
---
|
||||
src/Core/DataFilter.y | 3 +++
|
||||
src/Core/RideDB.y | 2 ++
|
||||
src/FileIO/JsonRideFile.y | 3 +++
|
||||
3 files changed, 8 insertions(+)
|
||||
|
||||
diff --git a/src/Core/DataFilter.y b/src/Core/DataFilter.y
|
||||
index 7c5e481b0..142e80a5c 100644
|
||||
--- a/src/Core/DataFilter.y
|
||||
+++ b/src/Core/DataFilter.y
|
||||
@@ -49,6 +49,9 @@ extern Leaf *DataFilterroot; // root node for parsed statement
|
||||
|
||||
%}
|
||||
|
||||
+// generated by the scanner
|
||||
+%define api.header.include {"DataFilter_yacc.h"}
|
||||
+
|
||||
// Symbol can be meta or metric name
|
||||
%token <leaf> SYMBOL PYTHON
|
||||
|
||||
diff --git a/src/Core/RideDB.y b/src/Core/RideDB.y
|
||||
index d6da086bd..f2001e23c 100644
|
||||
--- a/src/Core/RideDB.y
|
||||
+++ b/src/Core/RideDB.y
|
||||
@@ -40,6 +40,8 @@ void RideDBerror(void*jc, const char *error) // used by parser aka yyerror()
|
||||
#define scanner jc->scanner
|
||||
|
||||
%}
|
||||
+// generated by the scanner
|
||||
+%define api.header.include {"RideDB_yacc.h"}
|
||||
|
||||
%pure-parser
|
||||
%lex-param { void *scanner }
|
||||
diff --git a/src/FileIO/JsonRideFile.y b/src/FileIO/JsonRideFile.y
|
||||
index 2cbbef9fc..d5c77a779 100644
|
||||
--- a/src/FileIO/JsonRideFile.y
|
||||
+++ b/src/FileIO/JsonRideFile.y
|
||||
@@ -106,6 +106,9 @@ static QString protect(const QString string)
|
||||
|
||||
%}
|
||||
|
||||
+// generated by the scanner
|
||||
+%define api.header.include {"JsonRideFile_yacc.h"}
|
||||
+
|
||||
%pure-parser
|
||||
%lex-param { void *scanner }
|
||||
%parse-param { struct JsonContext *jc }
|
||||
--
|
||||
2.34.1
|
||||
|
||||
82
pkgs/applications/misc/golden-cheetah/default.nix
Normal file
82
pkgs/applications/misc/golden-cheetah/default.nix
Normal file
|
|
@ -0,0 +1,82 @@
|
|||
{ lib, fetchFromGitHub, fetchpatch, mkDerivation
|
||||
, qtbase, qtsvg, qtserialport, qtwebengine, qtmultimedia, qttools
|
||||
, qtconnectivity, qtcharts, libusb-compat-0_1, gsl, blas
|
||||
, bison, flex, zlib, qmake, makeDesktopItem, makeWrapper
|
||||
}:
|
||||
|
||||
let
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "goldencheetah";
|
||||
exec = "GoldenCheetah";
|
||||
icon = "goldencheetah";
|
||||
desktopName = "GoldenCheetah";
|
||||
genericName = "GoldenCheetah";
|
||||
comment = "Performance software for cyclists, runners and triathletes";
|
||||
categories = [ "Utility" ];
|
||||
};
|
||||
in mkDerivation rec {
|
||||
pname = "golden-cheetah";
|
||||
version = "3.6-DEV2111";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GoldenCheetah";
|
||||
repo = "GoldenCheetah";
|
||||
rev = "v${version}";
|
||||
sha256 = "17sk89szvaq31bcv6rgfn1bbw132k7w8zlalfb3ayflavdxbk6sa";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtsvg
|
||||
qtserialport
|
||||
qtwebengine
|
||||
qtmultimedia
|
||||
qttools
|
||||
zlib
|
||||
qtconnectivity
|
||||
qtcharts
|
||||
libusb-compat-0_1
|
||||
gsl
|
||||
blas
|
||||
];
|
||||
nativeBuildInputs = [ flex makeWrapper qmake bison ];
|
||||
|
||||
patches = [
|
||||
# allow building with bison 3.7
|
||||
# Included in https://github.com/GoldenCheetah/GoldenCheetah/pull/3590,
|
||||
# which is periodically rebased but pre 3.6 release, as it'll break other CI systems
|
||||
./0001-Fix-building-with-bison-3.7.patch
|
||||
];
|
||||
|
||||
NIX_LDFLAGS = "-lz -lgsl -lblas";
|
||||
|
||||
qtWrapperArgs = [ "--prefix" "LD_LIBRARY_PATH" ":" "${zlib.out}/lib" ];
|
||||
|
||||
preConfigure = ''
|
||||
cp src/gcconfig.pri.in src/gcconfig.pri
|
||||
cp qwt/qwtconfig.pri.in qwt/qwtconfig.pri
|
||||
echo 'QMAKE_LRELEASE = ${qttools.dev}/bin/lrelease' >> src/gcconfig.pri
|
||||
echo 'LIBUSB_INSTALL = ${libusb-compat-0_1}' >> src/gcconfig.pri
|
||||
echo 'LIBUSB_INCLUDE = ${libusb-compat-0_1.dev}/include' >> src/gcconfig.pri
|
||||
echo 'LIBUSB_LIBS = -L${libusb-compat-0_1}/lib -lusb' >> src/gcconfig.pri
|
||||
sed -i -e '21,23d' qwt/qwtconfig.pri # Removed forced installation to /usr/local
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
cp src/GoldenCheetah $out/bin
|
||||
install -Dm644 "${desktopItem}/share/applications/"* -t $out/share/applications/
|
||||
install -Dm644 src/Resources/images/gc.png $out/share/pixmaps/goldencheetah.png
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Performance software for cyclists, runners and triathletes";
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ ];
|
||||
license = licenses.gpl2Plus;
|
||||
};
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue