diff options
| author | K900 <me@0upti.me> | 2023-07-29 13:57:50 +0300 |
|---|---|---|
| committer | K900 <me@0upti.me> | 2023-08-15 22:11:39 +0300 |
| commit | 6edd6f71c7a089e88e500243904ea76ef023930c (patch) | |
| tree | 4ff57d72271b88c100d167c19f2214dd51518987 /pkgs/applications/misc/edgetx | |
| parent | 4d0a76416f5ca0402bfe7fc3fcd52a6d36c660c3 (diff) | |
treewide: clean up all qttranslations workarounds
There are two kinds of changes here: - removing explicit qttranslations path hardcoding from applications that were patched to do it - replacing qttranslations in buildInputs with qttools for packages that really depend on the latter After this, qttranslation is never used outside Qt itself, as it should.
Diffstat (limited to 'pkgs/applications/misc/edgetx')
| -rw-r--r-- | pkgs/applications/misc/edgetx/default.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/applications/misc/edgetx/default.nix b/pkgs/applications/misc/edgetx/default.nix index 785ad0ba229a5..9e7cf60af1a19 100644 --- a/pkgs/applications/misc/edgetx/default.nix +++ b/pkgs/applications/misc/edgetx/default.nix @@ -1,6 +1,6 @@ { lib, mkDerivation, fetchFromGitHub , cmake, gcc-arm-embedded, python3Packages -, qtbase, qtmultimedia, qttranslations, SDL, gtest +, qtbase, qtmultimedia, qttools, SDL, gtest , dfu-util }: @@ -16,9 +16,9 @@ mkDerivation rec { sha256 = "sha256-bKMAyONy1Udd+2nDVEMrtIsnfqrNuBVMWU7nCqvZ+3E="; }; - nativeBuildInputs = [ cmake gcc-arm-embedded python3Packages.pillow ]; + nativeBuildInputs = [ cmake gcc-arm-embedded python3Packages.pillow qttools ]; - buildInputs = [ qtbase qtmultimedia qttranslations SDL ]; + buildInputs = [ qtbase qtmultimedia SDL ]; postPatch = '' sed -i companion/src/burnconfigdialog.cpp \ @@ -27,7 +27,6 @@ mkDerivation rec { cmakeFlags = [ "-DGTEST_ROOT=${gtest.src}/googletest" - "-DQT_TRANSLATIONS_DIR=${qttranslations}/translations" "-DDFU_UTIL_PATH=${dfu-util}/bin/dfu-util" # file RPATH_CHANGE could not write new RPATH "-DCMAKE_SKIP_BUILD_RPATH=ON" |