Unverified Commit 0f650493 authored by K900's avatar K900 Committed by GitHub
Browse files

Merge pull request #202210 from apfelkuchen6/solid 

libsForQt515.solid: patch binary search paths
parents 624432c2 9a848178

pkgs/development/libraries/kde-frameworks/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ let 
      oxygen-icons5 = callPackage ./oxygen-icons5.nix {};

      prison = callPackage ./prison.nix {};

      qqc2-desktop-style = callPackage ./qqc2-desktop-style.nix {};

      solid = callPackage ./solid.nix {};

      solid = callPackage ./solid {};

      sonnet = callPackage ./sonnet.nix {};

      syntax-highlighting = callPackage ./syntax-highlighting.nix {};

      threadweaver = callPackage ./threadweaver.nix {};

pkgs/development/libraries/kde-frameworks/solid.nix→pkgs/development/libraries/kde-frameworks/solid/default.nix

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 


mkDerivation {

  pname = "solid";

  patches = [ ./fix-search-path.patch ];

  nativeBuildInputs = [ bison extra-cmake-modules flex media-player-info ];

  buildInputs = [ qtdeclarative qttools ];

  propagatedBuildInputs = [ qtbase ];

pkgs/development/libraries/kde-frameworks/solid/fix-search-path.patch

0 → 100644
+17 −0
Original line number Diff line number Diff line 
diff --git a/src/solid/devices/backends/fstab/fstabhandling.cpp b/src/solid/devices/backends/fstab/fstabhandling.cpp

index ac2a628..7ee46cc 100644

--- a/src/solid/devices/backends/fstab/fstabhandling.cpp

+++ b/src/solid/devices/backends/fstab/fstabhandling.cpp

@@ -275,7 +275,11 @@ bool Solid::Backends::Fstab::FstabHandling::callSystemCommand(const QString &com

                                                               const QObject *receiver,

                                                               std::function<void(QProcess *)> callback)

 {

-    static const QStringList searchPaths{QStringLiteral("/sbin"), QStringLiteral("/bin"), QStringLiteral("/usr/sbin"), QStringLiteral("/usr/bin")};

+    static const QStringList searchPaths{QStringLiteral("/run/wrappers/bin"),

+                                         QStringLiteral("/sbin"),

+                                         QStringLiteral("/bin"),

+                                         QStringLiteral("/usr/sbin"),

+                                         QStringLiteral("/usr/bin")};

     static const QString joinedPaths = searchPaths.join(QLatin1Char(':'));

     const QString exec = QStandardPaths::findExecutable(commandName, searchPaths);

     if (exec.isEmpty()) {