From 0761bdbc291ca1f0c7f4795b7245607e8cf09426 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 12 Jul 2018 20:42:34 -0400 Subject: [PATCH 1/2] lollypop-portal: init at 0.9.7 --- pkgs/misc/lollypop-portal/default.nix | 60 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 ++ 2 files changed, 63 insertions(+) create mode 100644 pkgs/misc/lollypop-portal/default.nix diff --git a/pkgs/misc/lollypop-portal/default.nix b/pkgs/misc/lollypop-portal/default.nix new file mode 100644 index 00000000000..f9cd9ae7df5 --- /dev/null +++ b/pkgs/misc/lollypop-portal/default.nix @@ -0,0 +1,60 @@ +{ stdenv, fetchFromGitLab, meson, ninja, pkgconfig +, python36Packages, gnome3, gst_all_1, gtk3, libnotify +, kid3, easytag, gobjectIntrospection, wrapGAppsHook }: + +stdenv.mkDerivation rec { + name = "lollypop-portal"; + version = "0.9.7"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "gnumdk"; + repo = name; + rev = version; + sha256 = "0rn5xmh6391i9l69y613pjad3pzdilskr2xjfcir4vpk8wprvph3"; + }; + + nativeBuildInputs = [ + gobjectIntrospection + meson + ninja + pkgconfig + python36Packages.wrapPython + wrapGAppsHook + ]; + + buildInputs = [ + gnome3.totem-pl-parser + gnome3.libsecret + gnome3.gnome-settings-daemon + + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + + gtk3 + libnotify + ]; + + pythonPath = with python36Packages; [ + pygobject3 + pydbus + pycairo + ]; + + preFixup = '' + buildPythonPath "$out/libexec/lollypop-portal $pythonPath" + + gappsWrapperArgs+=( + --prefix PYTHONPATH : "$program_PYTHONPATH" + --prefix PATH : "${stdenv.lib.makeBinPath [ easytag kid3 ]}" + ) + ''; + + meta = with stdenv.lib; { + description = "DBus Service for Lollypop"; + homepage = https://gitlab.gnome.org/gnumdk/lollypop-portal; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ worldofpeace ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d4399955ee6..3ffab85cb61 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21204,6 +21204,9 @@ with pkgs; lilypond-with-fonts = callPackage ../misc/lilypond/with-fonts.nix { lilypond = lilypond-unstable; }; + + lollypop-portal = callPackages ../misc/lollypop-portal { }; + openlilylib-fonts = callPackage ../misc/lilypond/fonts.nix { }; mailcore2 = callPackage ../development/libraries/mailcore2 { From d2c2f34c44889ad899568261d22b75a6456645a4 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 12 Jul 2018 20:44:50 -0400 Subject: [PATCH 2/2] lollypop: remove easytag --- pkgs/applications/audio/lollypop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index d961393f9ec..96e1c504373 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ glib ] ++ (with gnome3; [ - easytag gsettings_desktop_schemas gtk3 libsecret libsoup totem-pl-parser + gsettings_desktop_schemas gtk3 libsecret libsoup totem-pl-parser ]) ++ (with gst_all_1; [ gst-libav gst-plugins-bad gst-plugins-base gst-plugins-good gst-plugins-ugly gstreamer