diff options
| author | Peter Hoeg <peter@hoeg.com> | 2020-02-13 11:08:50 +0800 |
|---|---|---|
| committer | Peter Hoeg <peter@hoeg.com> | 2020-04-07 20:53:09 +0800 |
| commit | 0c7ec502971b257fda79e6062840f90ece2a2a31 (patch) | |
| tree | 8eae130b2f615e83eeaa9641393c457e4cc6af8e /pkgs/applications | |
| parent | 230b54c3cb446561636e8b997d070c567c3cc6ec (diff) | |
| download | nixlib-0c7ec502971b257fda79e6062840f90ece2a2a31.tar nixlib-0c7ec502971b257fda79e6062840f90ece2a2a31.tar.gz nixlib-0c7ec502971b257fda79e6062840f90ece2a2a31.tar.bz2 nixlib-0c7ec502971b257fda79e6062840f90ece2a2a31.tar.lz nixlib-0c7ec502971b257fda79e6062840f90ece2a2a31.tar.xz nixlib-0c7ec502971b257fda79e6062840f90ece2a2a31.tar.zst nixlib-0c7ec502971b257fda79e6062840f90ece2a2a31.zip | |
elisa: move into kdeApplications
elisa is now part of the upstream kdeApplications bundle
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/audio/elisa/default.nix | 37 | ||||
| -rw-r--r-- | pkgs/applications/kde/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/applications/kde/elisa.nix | 46 |
3 files changed, 47 insertions, 37 deletions
diff --git a/pkgs/applications/audio/elisa/default.nix b/pkgs/applications/audio/elisa/default.nix deleted file mode 100644 index 1d56ce089d90..000000000000 --- a/pkgs/applications/audio/elisa/default.nix +++ /dev/null @@ -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; - }; -} diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 6788a5df3ff1..5994eaf1c713 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -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 {}; diff --git a/pkgs/applications/kde/elisa.nix b/pkgs/applications/kde/elisa.nix new file mode 100644 index 000000000000..a2bfa88f8127 --- /dev/null +++ b/pkgs/applications/kde/elisa.nix @@ -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 ]; + }; +} |