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

Merge pull request #82622 from lopsided98/opentx-update

Browse Source 
opentx: 2.2.1 -> 2.3.5, fix build
This commit is contained in:
Benjamin Hipple 2020-03-24 20:37:13 -04:00 committed by GitHub
commit fcbc4151d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,50 +1,38 @@
{ stdenv, fetchFromGitHub { stdenv, mkDerivation, fetchFromGitHub
, cmake, gcc-arm-embedded, binutils-arm-embedded, python , cmake, gcc-arm-embedded, python3Packages
, qt5, SDL, gtest , qtbase, qtmultimedia, qttranslations, SDL, gtest
, dfu-util, avrdude , dfu-util, avrdude
}: }:
let mkDerivation rec {
version = "2.2.1";
in stdenv.mkDerivation {
pname = "opentx"; pname = "opentx";
inherit version; version = "2.3.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "opentx"; owner = "opentx";
repo = "opentx"; repo = "opentx";
rev = version; rev = version;
sha256 = "01lnnkrxach21aivnx1k1iqhih02nixh8c4nk6rpw408p13him9g"; sha256 = "18iv3c74y9fpp1045s2l7l2dqfn9riyagrwmfwp2mmf2ccsrwz2g";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;
nativeBuildInputs = [ nativeBuildInputs = [ cmake gcc-arm-embedded python3Packages.pillow ];
cmake
gcc-arm-embedded binutils-arm-embedded
];
buildInputs = with qt5; [ buildInputs = [ qtbase qtmultimedia qttranslations SDL ];
python python.pkgs.pyqt4
qtbase qtmultimedia qttranslations
SDL
];
postPatch = '' postPatch = ''
sed -i companion/src/burnconfigdialog.cpp -e 's|/usr/.*bin/dfu-util|${dfu-util}/bin/dfu-util|' sed -i companion/src/burnconfigdialog.cpp \
sed -i companion/src/burnconfigdialog.cpp -e 's|/usr/.*bin/avrdude|${avrdude}/bin/avrdude|' -e 's|/usr/.*bin/dfu-util|${dfu-util}/bin/dfu-util|' \
-e 's|/usr/.*bin/avrdude|${avrdude}/bin/avrdude|'
''; '';
cmakeFlags = [ cmakeFlags = [
"-DGTEST_ROOT=${gtest.src}/googletest" "-DGTEST_ROOT=${gtest.src}/googletest"
"-DQT_TRANSLATIONS_DIR=${qt5.qttranslations}/translations" "-DQT_TRANSLATIONS_DIR=${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=NO"
]; ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
@ -54,11 +42,10 @@ in stdenv.mkDerivation {
firmware to the radio, backing up model settings, editing settings and firmware to the radio, backing up model settings, editing settings and
running radio simulators. running radio simulators.
''; '';
homepage = https://open-tx.org/; homepage = "https://www.open-tx.org/";
license = stdenv.lib.licenses.gpl2; license = licenses.gpl2;
platforms = [ "i686-linux" "x86_64-linux" ]; platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ];
maintainers = with maintainers; [ elitak ]; maintainers = with maintainers; [ elitak lopsided98 ];
broken = true;
}; };
} }

5
pkgs/top-level/all-packages.nix
View File

@ -21234,10 +21234,7 @@ in
opentimestamps-client = python3Packages.callPackage ../tools/misc/opentimestamps-client {}; opentimestamps-client = python3Packages.callPackage ../tools/misc/opentimestamps-client {};
opentx = callPackage ../applications/misc/opentx { opentx = libsForQt5.callPackage ../applications/misc/opentx { };
gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc;
binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils;
};
opera = callPackage ../applications/networking/browsers/opera {}; opera = callPackage ../applications/networking/browsers/opera {};