From b688bda73b893c205cce020a5a7fb31e352db64f Mon Sep 17 00:00:00 2001 From: Chuang Zhu Date: Sun, 28 Jan 2024 20:48:10 +0800 Subject: 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 --- pkgs/top-level/all-packages.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'pkgs/top-level') 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. -- cgit 1.4.1