diff options
| author | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-15 12:42:41 +0700 |
|---|---|---|
| committer | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-15 14:24:03 +0700 |
| commit | 108bdac3d99b6d94d3740422af5945e510238304 (patch) | |
| tree | dd91cf11f7c29bbd4542f5bdab986430025c02e2 /pkgs/applications/radio/uhd | |
| parent | 2e34288f0d8cf01eea228c7dbc50af9589b885f3 (diff) | |
pkgs/applications: stdenv.lib -> lib
Diffstat (limited to 'pkgs/applications/radio/uhd')
| -rw-r--r-- | pkgs/applications/radio/uhd/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/radio/uhd/default.nix b/pkgs/applications/radio/uhd/default.nix index 033c2c4e2a67..4645ae881a82 100644 --- a/pkgs/applications/radio/uhd/default.nix +++ b/pkgs/applications/radio/uhd/default.nix @@ -33,7 +33,7 @@ let onOffBool = b: if b then "ON" else "OFF"; - inherit (stdenv.lib) optionals; + inherit (lib) optionals; in stdenv.mkDerivation rec { @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { # 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 - ++ [ (stdenv.lib.optionalString stdenv.isAarch32 "-DCMAKE_CXX_FLAGS=-Wno-psabi") ] + ++ [ (lib.optionalString stdenv.isAarch32 "-DCMAKE_CXX_FLAGS=-Wno-psabi") ] ; # Python + Mako are always required for the build itself but not necessary for runtime. |