tjh.dev
opentx: fix build, support building tests
It checks for "nano" with "if(NOT NANO STREQUAL NO)".
Broken since https://hydra.nixos.org/build/83296608 (#48286).
+4
-3
pkgs/applications/misc/opentx/default.nix
+4
-3
pkgs/applications/misc/opentx/default.nix
···
1
{ stdenv, fetchFromGitHub
2
, cmake, gcc-arm-embedded, binutils-arm-embedded, python
3
-
, qt5, SDL, gmock
4
, dfu-util, avrdude
5
}:
6
···
29
buildInputs = with qt5; [
30
python python.pkgs.pyqt4
31
qtbase qtmultimedia qttranslations
32
-
SDL gmock
33
];
34
35
postPatch = ''
···
38
'';
39
40
cmakeFlags = [
41
"-DQT_TRANSLATIONS_DIR=${qt5.qttranslations}/translations"
42
# XXX I would prefer to include these here, though we will need to file a bug upstream to get that changed.
43
#"-DDFU_UTIL_PATH=${dfu-util}/bin/dfu-util"
44
#"-DAVRDUDE_PATH=${avrdude}/bin/avrdude"
45
-
"-DNANO=OFF"
46
];
47
48
meta = with stdenv.lib; {
···
1
{ stdenv, fetchFromGitHub
2
, cmake, gcc-arm-embedded, binutils-arm-embedded, python
3
+
, qt5, SDL, gtest
4
, dfu-util, avrdude
5
}:
6
···
29
buildInputs = with qt5; [
30
python python.pkgs.pyqt4
31
qtbase qtmultimedia qttranslations
32
+
SDL
33
];
34
35
postPatch = ''
···
38
'';
39
40
cmakeFlags = [
41
+
"-DGTEST_ROOT=${gtest.src}/googletest"
42
"-DQT_TRANSLATIONS_DIR=${qt5.qttranslations}/translations"
43
# XXX I would prefer to include these here, though we will need to file a bug upstream to get that changed.
44
#"-DDFU_UTIL_PATH=${dfu-util}/bin/dfu-util"
45
#"-DAVRDUDE_PATH=${avrdude}/bin/avrdude"
46
+
"-DNANO=NO"
47
];
48
49
meta = with stdenv.lib; {