Merge remote-tracking branch 'upstream/staging-next' into staging

2021-05-11 22:30:46 +00:00
parent 912c8262b4 ec97081437
commit cf02b24813
47 changed files with 566 additions and 139 deletions
@@ -96,7 +96,7 @@ let
    ]
    ++ lib.optionals (unwrapped.hasFeature "gr-qtgui" unwrapped.features)
      # 3.7 builds with qt4
-      (if unwrapped.versionAttr.major == "3.8" then
+      (if lib.versionAtLeast unwrapped.versionAttr.major "3.8" then
        [
          "--prefix" "QT_PLUGIN_PATH" ":"
          "${