dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #284481 from chuangzhu/gnuradio-gcc13

Browse Source 
gnuradio3_{9,8}: fix build
This commit is contained in:
Doron Behar 2024-01-31 17:07:18 +02:00 committed by GitHub
commit afb69fea3c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/radio/gnuradio/3.8.nix
View File

@ -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

6
pkgs/applications/radio/gnuradio/3.9.nix
View File

@ -1,4 +1,5 @@
{ lib, stdenv
, fetchpatch
, fetchFromGitHub
, cmake
# Remove gcc and python references
@ -277,6 +278,11 @@ stdenv.mkDerivation (finalAttrs: (shared // {
patches = [
# Not accepted upstream, see https://github.com/gnuradio/gnuradio/pull/5227
./modtool-newmod-permissions.3_9.patch
# Fix compilation with GCC 13
(fetchpatch {
url = "https://github.com/gnuradio/gnuradio/commit/fe1b3592776c26e349e9985d47d3178568dfe6ec.patch";
hash = "sha256-bu6fJuUo/i4kM+cZqSw8moB0ymoSVooLfwUIW+WDpWI=";
})
];
passthru = shared.passthru // {
# Deps that are potentially overridden and are used inside GR plugins - the same version must

10
pkgs/top-level/all-packages.nix
View File

@ -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.