about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorChuang Zhu <git@chuang.cz>2024-01-28 20:48:10 +0800
committerDoron Behar <doron.behar@gmail.com>2024-01-31 16:19:43 +0200
commitb688bda73b893c205cce020a5a7fb31e352db64f (patch)
tree94ddfcf026334f1f4ce8919bb9f94b88127449f5 /pkgs/top-level
parent1e1e90e32771c031b757128d7a246a41f0005cbf (diff)
downloadnixlib-b688bda73b893c205cce020a5a7fb31e352db64f.tar
nixlib-b688bda73b893c205cce020a5a7fb31e352db64f.tar.gz
nixlib-b688bda73b893c205cce020a5a7fb31e352db64f.tar.bz2
nixlib-b688bda73b893c205cce020a5a7fb31e352db64f.tar.lz
nixlib-b688bda73b893c205cce020a5a7fb31e352db64f.tar.xz
nixlib-b688bda73b893c205cce020a5a7fb31e352db64f.tar.zst
nixlib-b688bda73b893c205cce020a5a7fb31e352db64f.zip
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/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix10
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c25c85f04cdf..267e119c398a 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.