diff options
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/plasma5.nix | 3 | ||||
| -rw-r--r-- | pkgs/applications/kde/kio-extras.nix | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index 9bacdaa9be9..b7aa2eba81c 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -394,7 +394,8 @@ in # Extra UDEV rules used by Solid services.udev.packages = [ - pkgs.libmtp + # libmtp has "bin", "dev", "out" outputs. UDEV rules file is in "out". + pkgs.libmtp.out pkgs.media-player-info ]; diff --git a/pkgs/applications/kde/kio-extras.nix b/pkgs/applications/kde/kio-extras.nix index 4a41493a525..29a3bdc97bb 100644 --- a/pkgs/applications/kde/kio-extras.nix +++ b/pkgs/applications/kde/kio-extras.nix @@ -19,5 +19,12 @@ mkDerivation { kpty syntax-highlighting libmtp libssh openexr openslp phonon qtsvg samba solid gperf ]; + + # org.kde.kmtpd5 DBUS service launches kiod5 binary from kio derivation, not from kio-extras + postInstall = '' + substituteInPlace $out/share/dbus-1/services/org.kde.kmtpd5.service \ + --replace Exec=$out Exec=${kio} + ''; + CXXFLAGS = [ "-I${ilmbase.dev}/include/OpenEXR" ]; } |