···2626 "Python3", # only used for license checks
2727 },
2828 "discover": {
2929+ "ApkQt", # we don't have APK (duh)
2930 "rpm-ostree-1", # we don't have rpm-ostree (duh)
3031 "Snapd", # we don't have snaps and probably never will
3132 "packagekitqt6", # intentionally disabled
···1616 usermod = lib.getExe' shadow "usermod";
1717 })
18181919- # Provide a better looking and more NixOS specific Samba hint
2020- # Proposed upstream: https://invent.kde.org/network/kdenetwork-filesharing/-/merge_requests/56
1919+ # Provide a more NixOS specific Samba hint
2120 ./samba-hint.patch
2221 ];
2322
···11-diff --git a/samba/filepropertiesplugin/qml/MissingSambaPage.qml b/samba/filepropertiesplugin/qml/MissingSambaPage.qml
22-index 327c4a7..9e2eba7 100644
31--- a/samba/filepropertiesplugin/qml/MissingSambaPage.qml
42+++ b/samba/filepropertiesplugin/qml/MissingSambaPage.qml
55-@@ -6,20 +6,17 @@
66- import QtQuick 2.12
77- import QtQuick.Controls 2.5 as QQC2
88- import QtQuick.Layouts 1.14
99--import org.kde.kirigami 2.4 as Kirigami
1010--import org.kde.filesharing.samba 1.0 as Samba
1111-+import org.kde.kirigami as Kirigami
33+@@ -16,7 +16,7 @@ Item {
44+55+ icon.name: "dialog-error"
1261313- // When built without packagekit we cannot do auto-installation.
1414--ColumnLayout {
1515-- QQC2.Label {
1616-- Layout.alignment: Qt.AlignHCenter
1717-- Layout.fillWidth: true
187- text: xi18nc("@info", "The <application>Samba</application> file sharing service must be installed before folders can be shared.")
198- explanation: i18n("Because this distro does not include PackageKit, we cannot show you a nice \"Install it\" button, and you will have to use your package manager to install the <command>samba</command> server package manually.")
2020-- wrapMode: Text.Wrap
2121-- }
2222-- Item {
2323-- Layout.alignment: Qt.AlignHCenter
2424-- Layout.fillHeight: true // space everything up
2525-+Item {
2626-+ Kirigami.PlaceholderMessage {
2727-+ anchors.centerIn: parent
2828-+ width: parent.width - (Kirigami.Units.largeSpacing * 4)
2929-+
3030-+ icon.name: "dialog-error"
3131-+
329+ text: xi18nc("@info", "File sharing service unavailable")
3310+ explanation: i18n("Please enable the `services.samba.enable` and `services.samba.usershares.enable` options in your NixOS configuration.")
3411 }