Unverified Commit 13659a54 authored by Arne Keller's avatar Arne Keller Committed by GitHub
Browse files

nixos/qgroundcontrol: fix qgroundcontrol module (#336183)

parents 6d127499 765c9bf4
Loading
Loading
Loading
Loading
+2 −7
Original line number Diff line number Diff line
@@ -40,13 +40,8 @@ in
      '';
    };

    # Security wrapper
    security.wrappers.qgroundcontrol = {
      source = lib.getExe cfg.package;
      owner = "root"; # Sensible default; not setuid so this is not a security risk
      group = "tty";
      setgid = true;
    };
    # Add to systemPackages for desktop entry file
    environment.systemPackages = [ cfg.package ];
  };

  meta.maintainers = pkgs.qgroundcontrol.meta.maintainers;
+29 −0
Original line number Diff line number Diff line
diff --git a/src/QGCApplication.cc b/src/QGCApplication.cc
index 7992ed00d..a9e0f0ba7 100644
--- a/src/QGCApplication.cc
+++ b/src/QGCApplication.cc
@@ -207,24 +207,6 @@ QGCApplication::QGCApplication(int &argc, char* argv[], bool unitTesting)
                     "sudo apt-get remove modemmanager</pre>").arg(qgcApp()->applicationName())));
             return;
         }
-        // Determine if we have the correct permissions to access USB serial devices
-        QFile permFile("/etc/group");
-        if(permFile.open(QIODevice::ReadOnly)) {
-            while(!permFile.atEnd()) {
-                QString line = permFile.readLine();
-                if (line.contains("dialout") && !line.contains(getenv("USER"))) {
-                    permFile.close();
-                    _exitWithError(QString(
-                        tr("The current user does not have the correct permissions to access serial devices. "
-                           "You should also remove modemmanager since it also interferes.<br/><br/>"
-                           "If you are using Ubuntu, execute the following commands to fix these issues:<br/>"
-                           "<pre>sudo usermod -a -G dialout $USER<br/>"
-                           "sudo apt-get remove modemmanager</pre>")));
-                    return;
-                }
-            }
-            permFile.close();
-        }
 
         // Always set style to default, this way QT_QUICK_CONTROLS_STYLE environment variable doesn't cause random changes in ui
         QQuickStyle::setStyle("Default");
+4 −0
Original line number Diff line number Diff line
@@ -91,6 +91,10 @@ stdenv.mkDerivation rec {
    fetchSubmodules = true;
  };

  patches = [
    ./disable-bad-message.patch
  ];

  meta = {
    description = "Provides full ground station support and configuration for the PX4 and APM Flight Stacks";
    homepage = "https://qgroundcontrol.com/";