diff --git a/pkgs/by-name/di/direwolf-unstable/package.nix b/pkgs/by-name/di/direwolf-unstable/package.nix index a16fd9c53f1ce..8f50631742e46 100644 --- a/pkgs/by-name/di/direwolf-unstable/package.nix +++ b/pkgs/by-name/di/direwolf-unstable/package.nix @@ -4,7 +4,7 @@ direwolf, nix-update-script, hamlibSupport ? true, - gpsdSupport ? true, + gpsdSupport ? false, extraScripts ? false, }: diff --git a/pkgs/by-name/di/direwolf/package.nix b/pkgs/by-name/di/direwolf/package.nix index 9be36e7f3b197..88db1e1e6a790 100644 --- a/pkgs/by-name/di/direwolf/package.nix +++ b/pkgs/by-name/di/direwolf/package.nix @@ -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 + sndio + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + avahi + udev + libcap + libgpiod + ] + ++ lib.optionals gpsdSupport [ gpsd ] + ++ lib.optionals hamlibSupport [ hamlib ] + ++ lib.optionals extraScripts [ + python3 + perl + espeak + ]; nativeInstallCheckInputs = [ versionCheckHook ]; preConfigure = lib.optionals (!extraScripts) ''