From c9b5c4a445845c48a7c7a3479087f2859c739f72 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 19 Feb 2016 15:12:08 +0100 Subject: [PATCH] kde5.kdeconnect: init at 0.9g --- pkgs/applications/misc/kdeconnect/0.7.nix | 36 ++++++++++ pkgs/applications/misc/kdeconnect/default.nix | 66 ++++++++++++------- pkgs/top-level/all-packages.nix | 4 +- 3 files changed, 82 insertions(+), 24 deletions(-) create mode 100644 pkgs/applications/misc/kdeconnect/0.7.nix diff --git a/pkgs/applications/misc/kdeconnect/0.7.nix b/pkgs/applications/misc/kdeconnect/0.7.nix new file mode 100644 index 00000000000..551d7c06468 --- /dev/null +++ b/pkgs/applications/misc/kdeconnect/0.7.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig +, gettext, kdelibs, libXtst, libfakekey, makeWrapper, qca2, qjson +}: + +stdenv.mkDerivation rec { + name = "kdeconnect-${version}"; + version = "0.7.3"; + + src = fetchurl { + url = "http://download.kde.org/unstable/kdeconnect/${version}/src/kdeconnect-kde-${version}.tar.xz"; + sha256 = "1vrr047bq5skxvibv5pb9ch9dxh005zmar017jzbyb9hilxr8kg4"; + }; + + buildInputs = [ gettext kdelibs libXtst libfakekey makeWrapper qca2 qjson ]; + + nativeBuildInputs = [ automoc4 cmake perl pkgconfig ]; + + meta = with stdenv.lib; { + description = "A tool to connect and sync your devices with KDE"; + longDescription = '' + The corresponding Android app, "KDE Connect", is available in + F-Droid and Google play and has the following features: + + - Share files and URLs to KDE from any app + - Clipboard share: copy from or to your desktop + - Notifications sync (4.3+): Read your Android notifications from KDE + - Multimedia remote control: Use your phone as a remote control + - WiFi connection: no usb wire or bluetooth needed + - RSA Encryption: your information is safe + ''; + license = licenses.gpl2; + homepage = https://projects.kde.org/projects/playground/base/kdeconnect-kde; + platforms = platforms.linux; + maintainers = [ maintainers.goibhniu ]; + }; +} diff --git a/pkgs/applications/misc/kdeconnect/default.nix b/pkgs/applications/misc/kdeconnect/default.nix index 551d7c06468..ff9c451461d 100644 --- a/pkgs/applications/misc/kdeconnect/default.nix +++ b/pkgs/applications/misc/kdeconnect/default.nix @@ -1,36 +1,56 @@ -{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig -, gettext, kdelibs, libXtst, libfakekey, makeWrapper, qca2, qjson +{ stdenv +, lib +, fetchurl +, extra-cmake-modules +, makeQtWrapper +, qtquick1 +, kcmutils +, kconfigwidgets +, kdbusaddons +, kiconthemes +, ki18n +, knotifications +, qca-qt5 +, libfakekey +, libXtst }: stdenv.mkDerivation rec { name = "kdeconnect-${version}"; - version = "0.7.3"; + version = "0.9g"; src = fetchurl { - url = "http://download.kde.org/unstable/kdeconnect/${version}/src/kdeconnect-kde-${version}.tar.xz"; - sha256 = "1vrr047bq5skxvibv5pb9ch9dxh005zmar017jzbyb9hilxr8kg4"; + url = http://download.kde.org/unstable/kdeconnect/0.9/src/kdeconnect-kde-0.9g.tar.xz; + sha256 = "4033754057bbc993b1d4350959afbe1d17a4f1e56dd60c6df6abca5a321ee1b8"; }; - buildInputs = [ gettext kdelibs libXtst libfakekey makeWrapper qca2 qjson ]; + buildInputs = [ + kcmutils + kconfigwidgets + kdbusaddons + qca-qt5 + qtquick1 + ki18n + kiconthemes + knotifications + libfakekey + libXtst + ]; - nativeBuildInputs = [ automoc4 cmake perl pkgconfig ]; + nativeBuildInputs = [ + extra-cmake-modules + makeQtWrapper + ]; - meta = with stdenv.lib; { - description = "A tool to connect and sync your devices with KDE"; - longDescription = '' - The corresponding Android app, "KDE Connect", is available in - F-Droid and Google play and has the following features: + postInstall = '' + wrapQtProgram "$out/bin/kdeconnect-cli" + ''; - - Share files and URLs to KDE from any app - - Clipboard share: copy from or to your desktop - - Notifications sync (4.3+): Read your Android notifications from KDE - - Multimedia remote control: Use your phone as a remote control - - WiFi connection: no usb wire or bluetooth needed - - RSA Encryption: your information is safe - ''; - license = licenses.gpl2; - homepage = https://projects.kde.org/projects/playground/base/kdeconnect-kde; - platforms = platforms.linux; - maintainers = [ maintainers.goibhniu ]; + meta = { + description = "KDE Connect provides several features to integrate your phone and your computer"; + license = with lib.licenses; [ gpl2 ]; + maintainers = with lib.maintainers; [ fridh ]; + homepage = https://community.kde.org/KDEConnect; }; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 662905129e5..8cda40f93b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14734,7 +14734,7 @@ let kde_wacomtablet = callPackage ../applications/misc/kde-wacomtablet { }; - kdeconnect = callPackage ../applications/misc/kdeconnect { }; + kdeconnect = callPackage ../applications/misc/kdeconnect/0.7.nix { }; kdenlive = callPackage ../applications/video/kdenlive { mlt = mlt-qt4; }; @@ -14926,6 +14926,8 @@ let k9copy = callPackage ../applications/video/k9copy {}; + kdeconnect = callPackage ../applications/misc/kdeconnect { }; + konversation = callPackage ../applications/networking/irc/konversation/1.6.nix { };