gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gnuradio: (wrapper) remove old conditionals

Browse Source
This commit is contained in:
Doron Behar
2026-01-20 23:47:50 +02:00
parent a0b84ca90b
commit ac2dce6119
1 changed files with 51 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/radio/gnuradio/wrapper.nix
+51 -66
View File
@@ -81,35 +81,31 @@ let
pname = unwrapped.pname + "-wrapped";
inherit (unwrapped) outputs version;
makeWrapperArgs = builtins.concatStringsSep " " (
[
]
# Emulating wrapGAppsHook3 & wrapQtAppsHook working together
++
lib.optionals ((unwrapped.hasFeature "gnuradio-companion") || (unwrapped.hasFeature "gr-qtgui"))
[
"--prefix"
"XDG_DATA_DIRS"
":"
"$out/share"
"--prefix"
"XDG_DATA_DIRS"
":"
"$out/share/gsettings-schemas/${pname}"
"--prefix"
"XDG_DATA_DIRS"
":"
"${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}"
"--prefix"
"XDG_DATA_DIRS"
":"
"${hicolor-icon-theme}/share"
# Needs to run `gsettings` on startup, see:
# https://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg1764890.html
"--prefix"
"PATH"
":"
"${lib.getBin glib}/bin"
]
lib.optionals ((unwrapped.hasFeature "gnuradio-companion") || (unwrapped.hasFeature "gr-qtgui")) [
"--prefix"
"XDG_DATA_DIRS"
":"
"$out/share"
"--prefix"
"XDG_DATA_DIRS"
":"
"$out/share/gsettings-schemas/${pname}"
"--prefix"
"XDG_DATA_DIRS"
":"
"${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}"
"--prefix"
"XDG_DATA_DIRS"
":"
"${hicolor-icon-theme}/share"
# Needs to run `gsettings` on startup, see:
# https://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg1764890.html
"--prefix"
"PATH"
":"
"${lib.getBin glib}/bin"
]
++ lib.optionals (unwrapped.hasFeature "gnuradio-companion") [
"--set"
"GDK_PIXBUF_MODULE_FILE"
@@ -157,45 +153,34 @@ let
":"
"${lib.makeSearchPath soapysdr.passthru.searchPath extraSoapySdrPackages}"
]
++
lib.optionals (unwrapped.hasFeature "gr-qtgui")
# 3.7 builds with qt4
(
if lib.versionAtLeast unwrapped.versionAttr.major "3.8" then
[
"--prefix"
"QT_PLUGIN_PATH"
":"
"${lib.makeSearchPath unwrapped.qt.qtbase.qtPluginPrefix (
map lib.getBin (
[
unwrapped.qt.qtbase
]
++ lib.optionals stdenv.hostPlatform.isLinux [
unwrapped.qt.qtwayland
]
)
)}"
"--prefix"
"QML2_IMPORT_PATH"
":"
"${lib.makeSearchPath unwrapped.qt.qtbase.qtQmlPrefix (
map lib.getBin (
[
unwrapped.qt.qtbase
]
++ lib.optionals stdenv.hostPlatform.isLinux [
unwrapped.qt.qtwayland
]
)
)}"
]
else
# Add here qt4 related environment for 3.7?
[
]
++ lib.optionals (unwrapped.hasFeature "gr-qtgui") [
"--prefix"
"QT_PLUGIN_PATH"
":"
"${lib.makeSearchPath unwrapped.qt.qtbase.qtPluginPrefix (
map lib.getBin (
[
unwrapped.qt.qtbase
]
++ lib.optionals stdenv.hostPlatform.isLinux [
unwrapped.qt.qtwayland
]
)
)}"
"--prefix"
"QML2_IMPORT_PATH"
":"
"${lib.makeSearchPath unwrapped.qt.qtbase.qtQmlPrefix (
map lib.getBin (
[
unwrapped.qt.qtbase
]
++ lib.optionals stdenv.hostPlatform.isLinux [
unwrapped.qt.qtwayland
]
)
)}"
]
++ extraMakeWrapperArgs
);