diff options
| author | Doron Behar <doron.behar@gmail.com> | 2024-04-28 14:11:07 +0300 |
|---|---|---|
| committer | Doron Behar <doron.behar@gmail.com> | 2024-04-28 16:24:00 +0300 |
| commit | d47575c3bf49d4f1b7dfcd1c4d76eef39f7fafc7 (patch) | |
| tree | 037fe4f6e794f7f2dc4741c19a4c8e15553d9fda /pkgs/applications/radio/uhd | |
| parent | 003ac8560e8b8bf81378f1af723ff01c36d1c159 (diff) | |
uhd: format lib.optionals usages
Diffstat (limited to 'pkgs/applications/radio/uhd')
| -rw-r--r-- | pkgs/applications/radio/uhd/default.nix | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/pkgs/applications/radio/uhd/default.nix b/pkgs/applications/radio/uhd/default.nix index 7994a11254aee..2aba164d3cba6 100644 --- a/pkgs/applications/radio/uhd/default.nix +++ b/pkgs/applications/radio/uhd/default.nix @@ -100,12 +100,12 @@ stdenv.mkDerivation (finalAttrs: { (cmakeBool "ENABLE_N320" enableN320) (cmakeBool "ENABLE_E300" enableE300) (cmakeBool "ENABLE_E320" enableE320) - ] # TODO: Check if this still needed # ABI differences GCC 7.1 # /nix/store/wd6r25miqbk9ia53pp669gn4wrg9n9cj-gcc-7.3.0/include/c++/7.3.0/bits/vector.tcc:394:7: note: parameter passing for argument of type 'std::vector<uhd::range_t>::iterator {aka __gnu_cxx::__normal_iterator<uhd::range_t*, std::vector<uhd::range_t> >}' changed in GCC 7.1 - ++ [ (lib.optionalString stdenv.isAarch32 "-DCMAKE_CXX_FLAGS=-Wno-psabi") ] - ; + ] ++ optionals stdenv.isAarch32 [ + "-DCMAKE_CXX_FLAGS=-Wno-psabi" + ]; pythonEnv = python3.withPackages pythonEnvArg; @@ -118,14 +118,16 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ boost libusb1 - ] # However, if enableLibuhd_Python_api *or* enableUtils is on, we need # pythonEnv for runtime as well. The utilities' runtime dependencies are # handled at the environment - ++ optionals (enableExamples) [ ncurses ncurses.dev ] - ++ optionals (enablePythonApi || enableUtils) [ finalAttrs.pythonEnv ] - ++ optionals (enableDpdk) [ dpdk ] - ; + ] ++ optionals (enableExamples) [ + ncurses ncurses.dev + ] ++ optionals (enablePythonApi || enableUtils) [ + finalAttrs.pythonEnv + ] ++ optionals (enableDpdk) [ + dpdk + ]; # many tests fails on darwin, according to ofborg doCheck = !stdenv.isDarwin; @@ -139,9 +141,12 @@ stdenv.mkDerivation (finalAttrs: { ./no-adapter-tests.patch ]; - postPhases = [ "installFirmware" "removeInstalledTests" ] - ++ optionals (enableUtils && stdenv.hostPlatform.isLinux) [ "moveUdevRules" ] - ; + postPhases = [ + "installFirmware" + "removeInstalledTests" + ] ++ optionals (enableUtils && stdenv.hostPlatform.isLinux) [ + "moveUdevRules" + ]; # UHD expects images in `$CMAKE_INSTALL_PREFIX/share/uhd/images` installFirmware = '' |