Skip to content

Commit 0cd0adf

Browse files
committed
edgetx: migrate to by-name
This is a zero rebuild refactor.
1 parent e7f5f3a commit 0cd0adf

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

pkgs/applications/misc/edgetx/default.nix renamed to pkgs/by-name/ed/edgetx/package.nix

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
{
22
lib,
3-
mkDerivation,
3+
stdenv,
44
fetchFromGitHub,
55
cmake,
66
gcc-arm-embedded,
77
python3Packages,
8-
qtbase,
9-
qtmultimedia,
10-
qttools,
8+
libsForQt5,
119
SDL,
1210
gtest,
1311
dfu-util,
1412
}:
1513

16-
mkDerivation rec {
14+
stdenv.mkDerivation rec {
1715
pname = "edgetx";
1816
version = "2.7.2";
1917

@@ -29,12 +27,13 @@ mkDerivation rec {
2927
cmake
3028
gcc-arm-embedded
3129
python3Packages.pillow
32-
qttools
30+
libsForQt5.qttools
31+
libsForQt5.wrapQtAppsHook
3332
];
3433

3534
buildInputs = [
36-
qtbase
37-
qtmultimedia
35+
libsForQt5.qtbase
36+
libsForQt5.qtmultimedia
3837
SDL
3938
];
4039

pkgs/top-level/all-packages.nix

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15360,8 +15360,6 @@ with pkgs;
1536015360
mopidy-ytmusic
1536115361
;
1536215362

15363-
edgetx = libsForQt5.callPackage ../applications/misc/edgetx { };
15364-
1536515363
mpg123 = callPackage ../applications/audio/mpg123 {
1536615364
inherit (darwin.apple_sdk.frameworks) AudioUnit AudioToolbox;
1536715365
jack = libjack2;

0 commit comments

Comments
 (0)