From 53588bac9655ec66b67a4bbba959f6029abc260c Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 7 Jan 2016 14:39:33 -0600 Subject: [PATCH 1/6] kde5: build kdenetwork-filesharing --- pkgs/applications/kde-apps-15.12/default.nix | 1 + .../kde-apps-15.12/kdenetwork-filesharing.nix | 29 +++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/applications/kde-apps-15.12/kdenetwork-filesharing.nix diff --git a/pkgs/applications/kde-apps-15.12/default.nix b/pkgs/applications/kde-apps-15.12/default.nix index e96c0c2af33..459ba52dac9 100644 --- a/pkgs/applications/kde-apps-15.12/default.nix +++ b/pkgs/applications/kde-apps-15.12/default.nix @@ -39,6 +39,7 @@ let 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; }; konsole = callPackage ./konsole.nix {}; libkdcraw = callPackage ./libkdcraw.nix {}; diff --git a/pkgs/applications/kde-apps-15.12/kdenetwork-filesharing.nix b/pkgs/applications/kde-apps-15.12/kdenetwork-filesharing.nix new file mode 100644 index 00000000000..4e99a43b391 --- /dev/null +++ b/pkgs/applications/kde-apps-15.12/kdenetwork-filesharing.nix @@ -0,0 +1,29 @@ +{ 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 ]; + }; +} From ba443da270a8f7eb6174134c54c2d56a184a9561 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 8 Jan 2016 09:03:50 -0600 Subject: [PATCH 2/6] kde5.kio: fix Samba detection --- .../libraries/kde-frameworks-5.17/default.nix | 2 +- .../{kio.nix => kio/default.nix} | 4 ++- .../kio/samba-search-path.patch | 28 +++++++++++++++++++ .../libraries/kde-frameworks-5.17/kio/series | 1 + 4 files changed, 33 insertions(+), 2 deletions(-) rename pkgs/development/libraries/kde-frameworks-5.17/{kio.nix => kio/default.nix} (87%) create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kio/samba-search-path.patch create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kio/series diff --git a/pkgs/development/libraries/kde-frameworks-5.17/default.nix b/pkgs/development/libraries/kde-frameworks-5.17/default.nix index 828faaa631f..f41aebcb59d 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/default.nix @@ -74,7 +74,7 @@ let 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 {}; diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kio.nix b/pkgs/development/libraries/kde-frameworks-5.17/kio/default.nix similarity index 87% rename from pkgs/development/libraries/kde-frameworks-5.17/kio.nix rename to pkgs/development/libraries/kde-frameworks-5.17/kio/default.nix index 199565e2418..a2131ff3385 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/kio.nix +++ b/pkgs/development/libraries/kde-frameworks-5.17/kio/default.nix @@ -1,4 +1,5 @@ -{ 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 @@ -8,6 +9,7 @@ kdeFramework { name = "kio"; + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; buildInputs = [ acl karchive kconfig kcoreaddons kdbusaddons kiconthemes diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kio/samba-search-path.patch b/pkgs/development/libraries/kde-frameworks-5.17/kio/samba-search-path.patch new file mode 100644 index 00000000000..c9ad46b41bb --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/kio/samba-search-path.patch @@ -0,0 +1,28 @@ +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; + } + diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kio/series b/pkgs/development/libraries/kde-frameworks-5.17/kio/series new file mode 100644 index 00000000000..77ca1545004 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.17/kio/series @@ -0,0 +1 @@ +samba-search-path.patch From fa0057be3988d61c08ca7a84668e71e1c97abc50 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 8 Jan 2016 09:04:04 -0600 Subject: [PATCH 3/6] nixos/kde5: install kdenetwork-filesharing if Samba enabled --- nixos/modules/services/x11/desktop-managers/kde5.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index 2aeb4f67d77..10ca2825ee1 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -125,6 +125,7 @@ in ++ 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 [ From e44af9ed42a464b1067b42b56940683e66b6a31f Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 8 Jan 2016 13:12:18 -0600 Subject: [PATCH 4/6] openslp: init at 2.0.0 --- .../development/libraries/openslp/default.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/openslp/default.nix diff --git a/pkgs/development/libraries/openslp/default.nix b/pkgs/development/libraries/openslp/default.nix new file mode 100644 index 00000000000..a77296b4895 --- /dev/null +++ b/pkgs/development/libraries/openslp/default.nix @@ -0,0 +1,19 @@ +{ 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; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 33d304d43ea..9c9a32f3eda 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8003,6 +8003,8 @@ let 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 { From 38ef49bacdad1b75dbcf0c46764e355456f44614 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 8 Jan 2016 13:12:29 -0600 Subject: [PATCH 5/6] kde5.kio-extras: init at 15.12.0 --- pkgs/applications/kde-apps-15.12/default.nix | 1 + .../kde-apps-15.12/kio-extras.nix | 58 +++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 pkgs/applications/kde-apps-15.12/kio-extras.nix diff --git a/pkgs/applications/kde-apps-15.12/default.nix b/pkgs/applications/kde-apps-15.12/default.nix index 459ba52dac9..15982cb5d64 100644 --- a/pkgs/applications/kde-apps-15.12/default.nix +++ b/pkgs/applications/kde-apps-15.12/default.nix @@ -41,6 +41,7 @@ let 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 {}; diff --git a/pkgs/applications/kde-apps-15.12/kio-extras.nix b/pkgs/applications/kde-apps-15.12/kio-extras.nix new file mode 100644 index 00000000000..77b42f1fc58 --- /dev/null +++ b/pkgs/applications/kde-apps-15.12/kio-extras.nix @@ -0,0 +1,58 @@ +{ 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 ]; + }; +} From 049357bb3083930750a3f01d36b42dae55f9bb2e Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 8 Jan 2016 13:12:43 -0600 Subject: [PATCH 6/6] nixos/kde5: install kio-extras --- nixos/modules/services/x11/desktop-managers/kde5.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index 10ca2825ee1..e8c768e41fa 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -102,6 +102,7 @@ in kde5.gwenview kde5.kate kde5.kdegraphics-thumbnailers + kde5.kio-extras kde5.konsole kde5.okular kde5.print-manager