diff options
author | Chuang Zhu <git@chuang.cz> | 2024-01-28 20:48:10 +0800 |
---|---|---|
committer | Doron Behar <doron.behar@gmail.com> | 2024-01-31 16:19:43 +0200 |
commit | b688bda73b893c205cce020a5a7fb31e352db64f (patch) | |
tree | 94ddfcf026334f1f4ce8919bb9f94b88127449f5 /pkgs | |
parent | 1e1e90e32771c031b757128d7a246a41f0005cbf (diff) |
gnuradio3_8Minimal: fix build on Linux by using gcc 12 libraries
Not using simply stdenv = gcc12Stdenv due to errors like this: /nix/store/...-binutils-2.40/bin/ld: /nix/store/...-boost-1.81.0/lib/libboost_program_options.so.1.81.0: undefined reference to `std::ios_base_library_init()@GLIBCXX_3.4.32' collect2: error: ld returned 1 exit status make[2]: *** [gr-fec/lib/reed-solomon/CMakeFiles/gr_fec_rstest.dir/build.make:131: gr-fec/lib/reed-solomon/gr_fec_rstest] Error 1 make[1]: *** [CMakeFiles/Makefile2:2165: gr-fec/lib/reed-solomon/CMakeFiles/gr_fec_rstest.dir/all] Error 2
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/radio/gnuradio/3.8.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/applications/radio/gnuradio/3.8.nix b/pkgs/applications/radio/gnuradio/3.8.nix index 3113915bce8d6..37533bb05d34d 100644 --- a/pkgs/applications/radio/gnuradio/3.8.nix +++ b/pkgs/applications/radio/gnuradio/3.8.nix @@ -244,6 +244,8 @@ stdenv.mkDerivation (finalAttrs: (shared // { rm gr-fec/python/fec/qa_polar_encoder.py rm gr-fec/python/fec/qa_polar_encoder_systematic.py rm gr-filter/python/filter/qa_freq_xlating_fft_filter.py + # Failed with libstdc++ from GCC 13 + rm gr-filter/python/filter/qa_filterbank.py ''; patches = [ # Not accepted upstream, see https://github.com/gnuradio/gnuradio/pull/5227 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c25c85f04cdf2..267e119c398a2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31668,12 +31668,14 @@ with pkgs; }; }; }; - gnuradio3_8 = disable-warnings-if-gcc13 (callPackage ../applications/radio/gnuradio/wrapper.nix { - unwrapped = callPackage ../applications/radio/gnuradio/3.8.nix { + gnuradio3_8 = callPackage ../applications/radio/gnuradio/wrapper.nix { + unwrapped = callPackage ../applications/radio/gnuradio/3.8.nix ({ inherit (darwin.apple_sdk.frameworks) CoreAudio; python = python3; - }; - }); + } // lib.optionalAttrs stdenv.isLinux { + stdenv = pkgs.stdenvAdapters.useLibsFrom stdenv pkgs.gcc12Stdenv; + }); + }; gnuradio3_8Packages = lib.recurseIntoAttrs gnuradio3_8.pkgs; # A build without gui components and other utilites not needed if gnuradio is # used as a c++ library. |