-
-
Notifications
You must be signed in to change notification settings - Fork 19.8k
direwolf: fix dependency stuff #484861
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
direwolf: fix dependency stuff #484861
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,14 +5,21 @@ | |
| fetchpatch, | ||
| cmake, | ||
| alsa-lib, | ||
| avahi, | ||
| gpsd, | ||
| gpsdSupport ? false, | ||
| hamlib_4, | ||
| hamlib ? hamlib_4, | ||
| hamlibSupport ? true, | ||
| hidapi, | ||
| libcap, | ||
| libgpiod, | ||
| libusb1, | ||
| perl, | ||
| pkg-config, | ||
| portaudio, | ||
| python3, | ||
| sndio, | ||
| espeak, | ||
| udev, | ||
| udevCheckHook, | ||
|
|
@@ -32,26 +39,32 @@ stdenv.mkDerivation (finalAttrs: { | |
| hash = "sha256-CCJr3l4RxYZLrdCRwio64EzpDyErlV9JDOXD6TH8p9o="; | ||
| }; | ||
|
|
||
| strictDeps = true; | ||
| nativeBuildInputs = [ | ||
| cmake | ||
| pkg-config | ||
| udevCheckHook | ||
| ]; | ||
|
|
||
| strictDeps = true; | ||
|
|
||
| buildInputs = | ||
| lib.optionals stdenv.hostPlatform.isLinux [ | ||
| alsa-lib | ||
| udev | ||
| ] | ||
| ++ lib.optionals stdenv.hostPlatform.isDarwin [ portaudio ] | ||
| ++ lib.optionals gpsdSupport [ gpsd ] | ||
| ++ lib.optionals hamlibSupport [ hamlib ] | ||
| ++ lib.optionals extraScripts [ | ||
| python3 | ||
| perl | ||
| espeak | ||
| ]; | ||
| buildInputs = [ | ||
| hidapi | ||
| libusb1 | ||
| portaudio | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. isnt
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. For the BSDs too IIUC. But my understanding is that it also works on linux, and if it isn't used it won't get linked anyway. |
||
| sndio | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. isnt |
||
| ] | ||
| ++ lib.optionals stdenv.hostPlatform.isLinux [ | ||
| alsa-lib | ||
| avahi | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
| udev | ||
| libcap | ||
| libgpiod | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Seems like it could be being a boolean and defaulted to |
||
| ] | ||
| ++ lib.optionals gpsdSupport [ gpsd ] | ||
| ++ lib.optionals hamlibSupport [ hamlib ] | ||
| ++ lib.optionals extraScripts [ | ||
| python3 | ||
| perl | ||
| espeak | ||
| ]; | ||
| nativeInstallCheckInputs = [ versionCheckHook ]; | ||
|
|
||
| preConfigure = lib.optionals (!extraScripts) '' | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should
CUSTOM_EXTERNAL_DIR(https://github.com/wb2osz/direwolf/blob/a231971a652bfb574a4bae9a5d875fbce53d2267/CMakeLists.txt#L78) be set? since it seems like direwolf's embedded its own hidapi source: https://github.com/wb2osz/direwolf/tree/1.8.1/external/hidapi