Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ae002fe44e96
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 666be18aa32d
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Dec 27, 2018

  1. 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).
    @orivej
    orivej committed Dec 27, 2018
    Copy the full SHA
    666be18 View commit details
Showing with 4 additions and 3 deletions.
  1. +4 −3 pkgs/applications/misc/opentx/default.nix
7 changes: 4 additions & 3 deletions pkgs/applications/misc/opentx/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub
, cmake, gcc-arm-embedded, binutils-arm-embedded, python
, qt5, SDL, gmock
, qt5, SDL, gtest
, dfu-util, avrdude
}:

@@ -29,7 +29,7 @@ in stdenv.mkDerivation {
buildInputs = with qt5; [
python python.pkgs.pyqt4
qtbase qtmultimedia qttranslations
SDL gmock
SDL
];

postPatch = ''
@@ -38,11 +38,12 @@ in stdenv.mkDerivation {
'';

cmakeFlags = [
"-DGTEST_ROOT=${gtest.src}/googletest"
"-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.
#"-DDFU_UTIL_PATH=${dfu-util}/bin/dfu-util"
#"-DAVRDUDE_PATH=${avrdude}/bin/avrdude"
"-DNANO=OFF"
"-DNANO=NO"
];

meta = with stdenv.lib; {