From 6be8a0ecd74c8f393283d194f439f94d07e04b56 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 21 Dec 2020 12:56:53 +0100 Subject: [PATCH 1/2] maintainers: add stunkymonkey --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e1b00052948..14d205fdd04 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8493,6 +8493,12 @@ githubId = 638763; name = "Stuart Moss"; }; + stunkymonkey = { + email = "account@buehler.rocks"; + github = "Stunkymonkey"; + githubId = 1315818; + name = "Felix Bühler"; + }; suhr = { email = "suhr@i2pmail.org"; github = "suhr"; From d130a65903b66ae0297717beefee03ccc206d9c2 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 21 Dec 2020 12:57:26 +0100 Subject: [PATCH 2/2] MediaElch: init at 2.8.2 --- pkgs/applications/misc/mediaelch/default.nix | 41 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/applications/misc/mediaelch/default.nix diff --git a/pkgs/applications/misc/mediaelch/default.nix b/pkgs/applications/misc/mediaelch/default.nix new file mode 100644 index 00000000000..c4ed0c975ea --- /dev/null +++ b/pkgs/applications/misc/mediaelch/default.nix @@ -0,0 +1,41 @@ +{ stdenv +, mkDerivation +, fetchFromGitHub +, qmake +, curl +, ffmpeg +, libmediainfo +, libzen +, qtbase +, qtdeclarative +, qtmultimedia +}: + +mkDerivation rec { + pname = "mediaelch"; + version = "2.8.2"; + + src = fetchFromGitHub { + owner = "Komet"; + repo = "MediaElch"; + rev = "v${version}"; + sha256 = "0y26vfgrdym461lzmm5x3z5ai9ky09vlk3cy4sq6hwlj7mzcz0k7"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ qmake ]; + + buildInputs = [ curl libmediainfo libzen ffmpeg qtbase qtdeclarative qtmultimedia ]; + + prePatch = '' + substituteInPlace MediaElch.pro --replace "/usr" "$out" + ''; + + meta = with stdenv.lib; { + homepage = "https://mediaelch.de/mediaelch/"; + description = "Media Manager for Kodi"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ stunkymonkey ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d0ffd9d20d2..5a57541db8d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22674,6 +22674,8 @@ in mda_lv2 = callPackage ../applications/audio/mda-lv2 { }; + mediaelch = libsForQt5.callPackage ../applications/misc/mediaelch { }; + mediainfo = callPackage ../applications/misc/mediainfo { }; mediainfo-gui = callPackage ../applications/misc/mediainfo-gui { };