diff options
| author | Doron Behar <doron.behar@gmail.com> | 2024-01-31 17:07:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-31 17:07:18 +0200 |
| commit | afb69fea3c9fe754bae550b2c9561971e9fbdd52 (patch) | |
| tree | cde44077fef362282387448fde3846d92346034b /pkgs/top-level | |
| parent | fe9057edb75c3755d64ee68bcb7a8ba6d3b42de6 (diff) | |
| parent | b688bda73b893c205cce020a5a7fb31e352db64f (diff) | |
Merge pull request #284481 from chuangzhu/gnuradio-gcc13
gnuradio3_{9,8}: fix buildDiffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 95f8236a9f09a..32830c460df9b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31619,12 +31619,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. |