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

opentx: fix build, support building tests

Browse Source 
It checks for "nano" with "if(NOT NANO STREQUAL NO)".

Broken since https://hydra.nixos.org/build/83296608 (#48286).
This commit is contained in:
Orivej Desh 2018-12-27 11:40:50 +00:00
parent ae002fe44e
commit 666be18aa3
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/misc/opentx/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub { stdenv, fetchFromGitHub
, cmake, gcc-arm-embedded, binutils-arm-embedded, python , cmake, gcc-arm-embedded, binutils-arm-embedded, python
, qt5, SDL, gmock , qt5, SDL, gtest
, dfu-util, avrdude , dfu-util, avrdude
}: }:
@ -29,7 +29,7 @@ in stdenv.mkDerivation {
buildInputs = with qt5; [ buildInputs = with qt5; [
python python.pkgs.pyqt4 python python.pkgs.pyqt4
qtbase qtmultimedia qttranslations qtbase qtmultimedia qttranslations
SDL gmock SDL
]; ];
postPatch = '' postPatch = ''
@ -38,11 +38,12 @@ in stdenv.mkDerivation {
''; '';
cmakeFlags = [ cmakeFlags = [
"-DGTEST_ROOT=${gtest.src}/googletest"
"-DQT_TRANSLATIONS_DIR=${qt5.qttranslations}/translations" "-DQT_TRANSLATIONS_DIR=${qt5.qttranslations}/translations"
# XXX I would prefer to include these here, though we will need to file a bug upstream to get that changed. # XXX I would prefer to include these here, though we will need to file a bug upstream to get that changed.
#"-DDFU_UTIL_PATH=${dfu-util}/bin/dfu-util" #"-DDFU_UTIL_PATH=${dfu-util}/bin/dfu-util"
#"-DAVRDUDE_PATH=${avrdude}/bin/avrdude" #"-DAVRDUDE_PATH=${avrdude}/bin/avrdude"
"-DNANO=OFF" "-DNANO=NO"
]; ];
meta = with stdenv.lib; { meta = with stdenv.lib; {