dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages 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 {}; kcharselect = callPackage ./kcharselect.nix {};
kcolorchooser = callPackage ./kcolorchooser.nix {}; kcolorchooser = callPackage ./kcolorchooser.nix {};
kdebugsettings = callPackage ./kdebugsettings.nix {}; kdebugsettings = callPackage ./kdebugsettings.nix {};
kdeconnect-kde = callPackage ./kdeconnect-kde.nix {};
kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix {}; kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix {};
kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {}; kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {};
kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {}; kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {};

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

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

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 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_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 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 kdiff3-qt5 = kdiff3; # added 2017-02-18
keepass-keefox = keepass-keepassrpc; # backwards compatibility alias, added 2018-02 keepass-keefox = keepass-keepassrpc; # backwards compatibility alias, added 2018-02
keepassx-community = keepassxc; # added 2017-11 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 kaddressbook kalzium kapptemplate kapman kate katomic
kblackbox kblocks kbounce kblackbox kblocks kbounce
kcachegrind kcalc kcharselect kcolorchooser kcachegrind kcalc kcharselect kcolorchooser
kdenlive kdf kdialog kdiamond kdeconnect-kde kdenlive kdf kdialog kdiamond
keditbookmarks keditbookmarks
kfind kfloppy kfind kfloppy
kget kgpg kget kgpg
@ -21733,8 +21733,6 @@ in
k4dirstat = libsForQt5.callPackage ../applications/misc/k4dirstat { }; k4dirstat = libsForQt5.callPackage ../applications/misc/k4dirstat { };
kdeconnect = libsForQt512.callPackage ../applications/misc/kdeconnect { };
inherit (kdeFrameworks) kdesu; inherit (kdeFrameworks) kdesu;
kdevelop-pg-qt = libsForQt514.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { }; kdevelop-pg-qt = libsForQt514.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { };