ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-28 14:22:50 +03:00
Code Issues Projects Releases Wiki Activity

kdeconnect: part of kdeApplications

Browse Source
This commit is contained in:
Peter Hoeg 2020-10-28 16:13:31 +08:00
parent d87b88361a
commit 0d25246f4d
4 changed files with 37 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/applications/kde/default.nix
View File

@ -107,6 +107,7 @@ let
kcharselect = callPackage ./kcharselect.nix {};
kcolorchooser = callPackage ./kcolorchooser.nix {};
kdebugsettings = callPackage ./kdebugsettings.nix {};
kdeconnect-kde = callPackage ./kdeconnect-kde.nix {};
kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix {};
kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {};
kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {};

74
pkgs/applications/misc/kdeconnect/default.nix → pkgs/applications/kde/kdeconnect-kde.nix
View File

@ -1,39 +1,32 @@
{ mkDerivation
, lib
, fetchurl
, fetchpatch
, extra-cmake-modules
, fetchpatch
, kcmutils
, kconfigwidgets
, kdbusaddons
, kdoctools
, kiconthemes
, ki18n
, knotifications
, qca-qt5
, libfakekey
, libXtst
, qtx11extras
, qtmultimedia
, qtgraphicaleffects
, sshfs
, makeWrapper
, kwayland
, kiconthemes
, kio
, kpeoplevcard
, kpeople
, kirigami2
, knotifications
, kpeople
, kpeoplevcard
, kwayland
, lib
, libXtst
, libfakekey
, makeWrapper
, pulseaudio-qt
, qca-qt5
, qtgraphicaleffects
, qtmultimedia
, qtx11extras
, sshfs
}:
mkDerivation rec {
pname = "kdeconnect";
version = "20.08.2";
src = fetchurl {
url = "https://download.kde.org/stable/release-service/${version}/src/${pname}-kde-${version}.tar.xz";
sha256 = "0rzfnkgkv759d4pa16qk0sw87wqzwgkd99yzrzfy2zcq423f6hvd";
};
mkDerivation {
name = "kdeconnect-kde";
patches = [
# https://invent.kde.org/network/kdeconnect-kde/-/merge_requests/328
@ -44,35 +37,32 @@ mkDerivation rec {
];
buildInputs = [
libfakekey
libXtst
qtmultimedia
qtgraphicaleffects
pulseaudio-qt
kpeoplevcard
kpeople
kirigami2
ki18n
kiconthemes
kcmutils
kconfigwidgets
kdbusaddons
knotifications
qca-qt5
qtx11extras
makeWrapper
kwayland
ki18n
kiconthemes
kio
kirigami2
knotifications
kpeople
kpeoplevcard
kwayland
libXtst
libfakekey
pulseaudio-qt
qca-qt5
qtgraphicaleffects
qtmultimedia
qtx11extras
];
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ];
postInstall = ''
wrapProgram $out/libexec/kdeconnectd --prefix PATH : ${lib.makeBinPath [ sshfs ]}
'';
enableParallelBuilding = true;
meta = with lib; {
description = "KDE Connect provides several features to integrate your phone and your computer";
homepage = "https://community.kde.org/KDEConnect";

1
pkgs/top-level/aliases.nix
View File

@ -224,6 +224,7 @@ mapAliases ({
kdecoration-viewer = throw "kdecoration-viewer has been removed from nixpkgs, as there is no upstream activity"; # 2020-06-16
julia_07 = throw "julia_07 is deprecated in favor of julia_10 LTS"; # added 2020-09-15
julia_11 = throw "julia_11 is deprecated in favor of latest Julia version"; # added 2020-09-15
kdeconnect = kdeApplications.kdeconnect-kde; # added 2020-10-28
kdiff3-qt5 = kdiff3; # added 2017-02-18
keepass-keefox = keepass-keepassrpc; # backwards compatibility alias, added 2018-02
keepassx-community = keepassxc; # added 2017-11

4
pkgs/top-level/all-packages.nix
View File

@ -21708,7 +21708,7 @@ in
kaddressbook kalzium kapptemplate kapman kate katomic
kblackbox kblocks kbounce
kcachegrind kcalc kcharselect kcolorchooser
kdenlive kdf kdialog kdiamond
kdeconnect-kde kdenlive kdf kdialog kdiamond
keditbookmarks
kfind kfloppy
kget kgpg
@ -21733,8 +21733,6 @@ in
k4dirstat = libsForQt5.callPackage ../applications/misc/k4dirstat { };
kdeconnect = libsForQt512.callPackage ../applications/misc/kdeconnect { };
inherit (kdeFrameworks) kdesu;
kdevelop-pg-qt = libsForQt514.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { };