Commit ac2dce61 authored by Doron Behar's avatar Doron Behar
Browse files

gnuradio: (wrapper) remove old conditionals

parent a0b84ca9

pkgs/applications/radio/gnuradio/wrapper.nix

+51 −66
Original line number Diff line number Diff line
@@ -81,12 +81,8 @@ 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"))

        [

    lib.optionals ((unwrapped.hasFeature "gnuradio-companion") || (unwrapped.hasFeature "gr-qtgui")) [

      "--prefix"

      "XDG_DATA_DIRS"

      ":"
@@ -157,12 +153,7 @@ 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

            [

    ++ lib.optionals (unwrapped.hasFeature "gr-qtgui") [

      "--prefix"

      "QT_PLUGIN_PATH"

      ":"
@@ -190,12 +181,6 @@ let 
        )

      )}"

    ]

          else

            # Add here qt4 related environment for 3.7?

            [



            ]

        )

    ++ extraMakeWrapperArgs

  );