diff options
| author | K900 <me@0upti.me> | 2023-03-10 22:51:42 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-10 22:51:42 +0300 |
| commit | 0f6504938fc5c509a1e0328aa7852319a3a19ae6 (patch) | |
| tree | d47f9ca401ad69c375263e17be72e7216aabaf2f /pkgs/development/libraries/kde-frameworks | |
| parent | 624432c25b2044dc291608cd204a7dee5275089b (diff) | |
| parent | 9a8481780b31e101dc941a3d619ce4803dc5d525 (diff) | |
Merge pull request #202210 from apfelkuchen6/solid
libsForQt515.solid: patch binary search paths
Diffstat (limited to 'pkgs/development/libraries/kde-frameworks')
| -rw-r--r-- | pkgs/development/libraries/kde-frameworks/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/kde-frameworks/solid/default.nix (renamed from pkgs/development/libraries/kde-frameworks/solid.nix) | 1 | ||||
| -rw-r--r-- | pkgs/development/libraries/kde-frameworks/solid/fix-search-path.patch | 17 |
3 files changed, 19 insertions, 1 deletions
diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index 516f1ea8850ff..1e8ce2dd5227d 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -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 {}; diff --git a/pkgs/development/libraries/kde-frameworks/solid.nix b/pkgs/development/libraries/kde-frameworks/solid/default.nix index 69ef8c8adca3f..8c39025e94574 100644 --- a/pkgs/development/libraries/kde-frameworks/solid.nix +++ b/pkgs/development/libraries/kde-frameworks/solid/default.nix @@ -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 ]; diff --git a/pkgs/development/libraries/kde-frameworks/solid/fix-search-path.patch b/pkgs/development/libraries/kde-frameworks/solid/fix-search-path.patch new file mode 100644 index 0000000000000..010aa1f3efccd --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks/solid/fix-search-path.patch @@ -0,0 +1,17 @@ +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()) { |