Merge pull request #80003 from peterhoeg/f/elisa

elisa: move into kdeApplications
This commit is contained in:
Peter Hoeg 2020-04-07 20:54:03 +08:00 committed by GitHub
commit d7b98129fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 48 additions and 40 deletions

View File

@ -1,37 +0,0 @@
{ mkDerivation, fetchFromGitHub, lib
, extra-cmake-modules, kdoctools, wrapGAppsHook
, qtmultimedia, qtquickcontrols2, qtwebsockets
, kconfig, kcmutils, kcrash, kdeclarative, kfilemetadata, kinit, kirigami2
, baloo, vlc
}:
mkDerivation rec {
pname = "elisa";
version = "19.12.3";
src = fetchFromGitHub {
owner = "KDE";
repo = "elisa";
rev = "v${version}";
sha256 = "0s1sixkrx4czckzg0llkrbp8rp397ljsq1c309z23m277jsmnnb6";
};
buildInputs = [ vlc ];
nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
propagatedBuildInputs = [
qtmultimedia qtquickcontrols2 qtwebsockets
kconfig kcmutils kcrash kdeclarative kfilemetadata kinit kirigami2
baloo
];
enableParallelBuilding = true;
meta = with lib; {
description = "Elisa Music Player";
license = licenses.gpl3;
maintainers = with maintainers; [ peterhoeg ];
inherit (kconfig.meta) platforms;
};
}

View File

@ -78,6 +78,7 @@ let
dolphin = callPackage ./dolphin.nix {};
dolphin-plugins = callPackage ./dolphin-plugins.nix {};
dragon = callPackage ./dragon.nix {};
elisa = callPackage ./elisa.nix {};
eventviews = callPackage ./eventviews.nix {};
ffmpegthumbs = callPackage ./ffmpegthumbs.nix { };
filelight = callPackage ./filelight.nix {};

View File

@ -0,0 +1,46 @@
{ mkDerivation
, fetchFromGitHub
, lib
, extra-cmake-modules
, kdoctools
, qtmultimedia
, qtquickcontrols2
, qtwebsockets
, kconfig
, kcmutils
, kcrash
, kdeclarative
, kfilemetadata
, kinit
, kirigami2
, baloo
, vlc
}:
mkDerivation rec {
name = "elisa";
buildInputs = [ vlc ];
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [
baloo
kcmutils
kconfig
kcrash
kdeclarative
kfilemetadata
kinit
kirigami2
qtmultimedia
qtquickcontrols2
qtwebsockets
];
meta = with lib; {
description = "A simple media player for KDE";
license = licenses.gpl3;
maintainers = with maintainers; [ peterhoeg ];
};
}

View File

@ -4520,8 +4520,6 @@ in
krop = callPackage ../applications/graphics/krop { };
elisa = libsForQt5.callPackage ../applications/audio/elisa { };
kdiff3 = libsForQt5.callPackage ../tools/text/kdiff3 { };
kube-router = callPackage ../applications/networking/cluster/kube-router { };
@ -20123,7 +20121,7 @@ in
recurseIntoAttrs (makeOverridable mkApplications attrs);
inherit (kdeApplications)
akonadi akregator ark dolphin dragon ffmpegthumbs filelight gwenview k3b
akonadi akregator ark dolphin dragon elisa ffmpegthumbs filelight gwenview k3b
kaddressbook kate kcachegrind kcalc kcharselect kcolorchooser kdenlive kdf kdialog
keditbookmarks kfind kget kgpg khelpcenter kig kleopatra kmail kmix kmplot kolourpaint kompare konsole yakuake
kpkpass kitinerary kontact korganizer krdc krfb ksystemlog ktouch kwalletmanager marble minuet okular spectacle;