Merge branch 'kdenetwork-filesharing'

nixos/modules/services/x11/desktop-managers/kde5.nix

···
         kde5.gwenview
         kde5.kate
         kde5.kdegraphics-thumbnailers
+        kde5.kio-extras
         kde5.konsole
         kde5.okular
         kde5.print-manager
···
       ++ lib.optional config.networking.networkmanager.enable kde5.plasma-nm
       ++ lib.optional config.hardware.pulseaudio.enable kde5.plasma-pa
       ++ lib.optional config.powerManagement.enable kde5.powerdevil
+      ++ lib.optionals config.services.samba.enable [ kde5.kdenetwork-filesharing pkgs.samba ]
 
       ++ lib.optionals cfg.phonon.gstreamer.enable
         [

pkgs/applications/kde-apps-15.12/default.nix

···
     gwenview = callPackage ./gwenview.nix {};
     kate = callPackage ./kate.nix {};
     kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {};
+    kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {};
     kgpg = callPackage ./kgpg.nix { inherit (pkgs.kde4) kdepimlibs; };
+    kio-extras = callPackage ./kio-extras.nix {};
     konsole = callPackage ./konsole.nix {};
     libkdcraw = callPackage ./libkdcraw.nix {};
     libkexiv2 = callPackage ./libkexiv2.nix {};

pkgs/applications/kde-apps-15.12/kdenetwork-filesharing.nix

···
+{ kdeApp
+, lib
+, extra-cmake-modules
+, kdoctools
+, kcoreaddons
+, ki18n
+, kio
+, kwidgetsaddons
+, samba
+}:
+
+kdeApp {
+  name = "kdenetwork-filesharing";
+  nativeBuildInputs = [
+    extra-cmake-modules
+    kdoctools
+  ];
+  buildInputs = [
+    kcoreaddons
+    ki18n
+    kio
+    kwidgetsaddons
+    samba
+  ];
+  meta = {
+    license = [ lib.licenses.gpl2 lib.licenses.lgpl21 ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}

pkgs/applications/kde-apps-15.12/kio-extras.nix

···
+{ kdeApp, lib
+, extra-cmake-modules, kdoctools
+, shared_mime_info
+, exiv2
+, karchive
+, kbookmarks
+, kconfig, kconfigwidgets
+, kcoreaddons, kdbusaddons, kguiaddons
+, kdnssd
+, kiconthemes
+, ki18n
+, kio
+, khtml
+, kdelibs4support
+, kpty
+, libmtp
+, libssh
+, openexr
+, openslp
+, phonon
+, qtsvg
+, samba
+, solid
+}:
+
+kdeApp {
+  name = "kio-extras";
+  nativeBuildInputs = [
+    extra-cmake-modules kdoctools
+    shared_mime_info
+  ];
+  buildInputs = [
+    exiv2
+    karchive
+    kbookmarks
+    kconfig kconfigwidgets
+    kcoreaddons kdbusaddons kguiaddons
+    kdnssd
+    kiconthemes
+    ki18n
+    kio
+    khtml
+    kdelibs4support
+    kpty
+    libmtp
+    libssh
+    openexr
+    openslp
+    phonon
+    qtsvg
+    samba
+    solid
+  ];
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}

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

···
     kidletime = callPackage ./kidletime.nix {};
     kimageformats = callPackage ./kimageformats.nix {};
     kinit = callPackage ./kinit {};
-    kio = callPackage ./kio.nix {};
+    kio = callPackage ./kio {};
     kitemmodels = callPackage ./kitemmodels.nix {};
     kitemviews = callPackage ./kitemviews.nix {};
     kjobwidgets = callPackage ./kjobwidgets.nix {};

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

···
-{ kdeFramework, lib, extra-cmake-modules, acl, karchive
+{ kdeFramework, lib, copyPathsToStore
+, extra-cmake-modules, acl, karchive
 , kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons
 , kdbusaddons, kdoctools, ki18n, kiconthemes, kitemviews
 , kjobwidgets, knotifications, kservice, ktextwidgets, kwallet
···
 
 kdeFramework {
   name = "kio";
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
   buildInputs = [
     acl karchive kconfig kcoreaddons kdbusaddons kiconthemes

pkgs/development/libraries/kde-frameworks-5.17/kio/samba-search-path.patch

···
+Index: kio-5.17.0/src/core/ksambashare.cpp
+===================================================================
+--- kio-5.17.0.orig/src/core/ksambashare.cpp
++++ kio-5.17.0/src/core/ksambashare.cpp
+@@ -67,13 +67,18 @@ KSambaSharePrivate::~KSambaSharePrivate(
+ 
+ bool KSambaSharePrivate::isSambaInstalled()
+ {
+-    if (QFile::exists(QStringLiteral("/usr/sbin/smbd"))
+-            || QFile::exists(QStringLiteral("/usr/local/sbin/smbd"))) {
+-        return true;
++    const QByteArray pathEnv = qgetenv("PATH");
++    if (!pathEnv.isEmpty()) {
++        QLatin1Char pathSep(':');
++        QStringList paths = QFile::decodeName(pathEnv).split(pathSep, QString::SkipEmptyParts);
++        for (QStringList::iterator it = paths.begin(); it != paths.end(); ++it) {
++            it->append("/smbd");
++            if (QFile::exists(*it)) {
++                return true;
++            }
++        }
+     }
+ 
+-    //qDebug() << "Samba is not installed!";
+-
+     return false;
+ }
+ 

pkgs/development/libraries/kde-frameworks-5.17/kio/series

···
+samba-search-path.patch

pkgs/development/libraries/openslp/default.nix

···
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
+  name = "openslp-2.0.0";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/openslp/2.0.0/2.0.0/openslp-2.0.0.tar.gz";
+    sha256 = "16splwmqp0400w56297fkipaq9vlbhv7hapap8z09gp5m2i3fhwj";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = "http://openslp.org/";
+    description = "An open-source implementation of the IETF Service Location Protocol";
+    maintainers = with maintainers; [ ttuegel ];
+    license = licenses.bsd3;
+    platforms = platforms.all;
+  };
+
+}

pkgs/top-level/all-packages.nix

···
     ffmpeg = ffmpeg_0;
   };
 
+  openslp = callPackage ../development/libraries/openslp {};
+
   # 2.3 breaks some backward-compability
   libressl = libressl_2_2;
   libressl_2_2 = callPackage ../development/libraries/libressl/2.2.nix {