Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gnuradio3_8: fix build #348477

Closed
wants to merge 2 commits into from
Closed

gnuradio3_8: fix build #348477

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ebaad8
gnuradio3_8: fix qwt version
EwuUwe Oct 6, 2024
26fe643
gnuradio3_8: fix swig version
EwuUwe Oct 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions pkgs/applications/radio/gnuradio/3.8.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
, cairo
, qt5
, libsForQt5
, pcre
# Features available to override, the list of them is in featuresInfo. They
# are all turned on by default.
, features ? {}
Expand All @@ -44,6 +45,17 @@
}:

let
swig3 = ((swig.overrideAttrs (old: rec {
version = "3.0.12";
src = fetchFromGitHub {
owner = "swig";
repo = "swig";
rev = "rel-${version}";
sha256 = "1wyffskbkzj5zyhjnnpip80xzsjcr3p0q5486z3wdwabnysnhn8n";
};
})).override
{ pcre2 = pcre; });
Comment on lines +48 to +57
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aish, swig3 was just dropped in bfab6b0f8386 (#341384) . How did you conclude that swig3 is needed? I just built it locally without this swig3 commit.


sourceSha256 = "sha256-p4VFjTE0GXmdA7QGhWSUzO/WxJ+8Dq3JEnOABtQtJUU=";
featuresInfo = {
# Needed always
Expand Down Expand Up @@ -83,7 +95,7 @@ let
python-support = {
pythonRuntime = [ python.pkgs.six ];
native = [
swig
swig3
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This also requires changing the swig that is passed to the gnuradio3_8Packages...

python
];
cmakeEnableFlag = "PYTHON";
Expand All @@ -98,7 +110,7 @@ let
gr-ctrlport = {
cmakeEnableFlag = "GR_CTRLPORT";
native = [
swig
swig3
];
runtime = [
thrift
Expand Down Expand Up @@ -159,7 +171,7 @@ let
cmakeEnableFlag = "GR_CHANNELS";
};
gr-qtgui = {
runtime = [ qt5.qtbase libsForQt5.qwt ];
runtime = [ qt5.qtbase libsForQt5.qwt6_1 ];
pythonRuntime = [ python.pkgs.pyqt5 ];
cmakeEnableFlag = "GR_QTGUI";
};
Expand Down Expand Up @@ -268,7 +280,7 @@ stdenv.mkDerivation (finalAttrs: (shared // {
} // lib.optionalAttrs (hasFeature "gr-uhd") {
inherit uhd;
} // lib.optionalAttrs (hasFeature "gr-qtgui") {
inherit (libsForQt5) qwt;
inherit (libsForQt5) qwt6_1;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
inherit (libsForQt5) qwt6_1;
qwt = qwt6_1;

};
cmakeFlags = shared.cmakeFlags
# From some reason, if these are not set, libcodec2 and gsm are not
Expand Down