diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
| commit | 99fcaeccb89621dd492203ce1f2d551c06f228ed (patch) | |
| tree | 41cb730ae07383004789779b0f6e11cb3f4642a3 /nixpkgs/pkgs/development/libraries/kde-frameworks/solid | |
| parent | 59c5f5ac8682acc13bb22bc29c7cf02f7d75f01f (diff) | |
| parent | 75a5ebf473cd60148ba9aec0d219f72e5cf52519 (diff) | |
| download | nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.gz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.bz2 nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.lz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.xz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.zst nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/nixos/modules/config/console.nix nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/nixos/modules/services/mail/rss2email.nix nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix nixpkgs/pkgs/applications/networking/irc/weechat/default.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/interpreters/python/default.nix nixpkgs/pkgs/development/node-packages/overrides.nix nixpkgs/pkgs/development/tools/b4/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix nixpkgs/pkgs/servers/mail/public-inbox/default.nix nixpkgs/pkgs/tools/security/pinentry/default.nix nixpkgs/pkgs/tools/text/unoconv/default.nix nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/kde-frameworks/solid')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/kde-frameworks/solid/default.nix | 15 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/kde-frameworks/solid/fix-search-path.patch | 17 |
2 files changed, 32 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/solid/default.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/solid/default.nix new file mode 100644 index 000000000000..27160c3bda0d --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/solid/default.nix @@ -0,0 +1,15 @@ +{ + mkDerivation, lib, stdenv, + bison, extra-cmake-modules, flex, + media-player-info, qtbase, qtdeclarative, qttools +}: + +mkDerivation { + pname = "solid"; + patches = [ ./fix-search-path.patch ]; + nativeBuildInputs = [ bison extra-cmake-modules flex ] + ++ lib.optionals stdenv.isLinux [ media-player-info ]; + buildInputs = [ qtdeclarative qttools ]; + propagatedBuildInputs = [ qtbase ]; + propagatedUserEnvPkgs = lib.optionals stdenv.isLinux [ media-player-info ]; +} diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/solid/fix-search-path.patch b/nixpkgs/pkgs/development/libraries/kde-frameworks/solid/fix-search-path.patch new file mode 100644 index 000000000000..010aa1f3efcc --- /dev/null +++ b/nixpkgs/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()) { |