diff options
author | worldofpeace <worldofpeace@users.noreply.github.com> | 2019-04-26 12:18:40 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-26 12:18:40 -0400 |
commit | 07f96168e3e309d475d1121d697e08e641927801 (patch) | |
tree | 422a60d6c68902f4b5d675ee6fc440c3933faf76 /pkgs/applications/audio | |
parent | 6c28c29e643d36ea89a488d5cfb8241891846d86 (diff) | |
parent | db9efc95b24b693aad2b9f8ecdf0864dd3e3e56f (diff) | |
download | nixpkgs-07f96168e3e309d475d1121d697e08e641927801.tar nixpkgs-07f96168e3e309d475d1121d697e08e641927801.tar.gz nixpkgs-07f96168e3e309d475d1121d697e08e641927801.tar.bz2 nixpkgs-07f96168e3e309d475d1121d697e08e641927801.tar.lz nixpkgs-07f96168e3e309d475d1121d697e08e641927801.tar.xz nixpkgs-07f96168e3e309d475d1121d697e08e641927801.tar.zst nixpkgs-07f96168e3e309d475d1121d697e08e641927801.zip |
Merge pull request #60170 from worldofpeace/lollypop-bump
lollypop: 1.0.5 -> 1.0.7, other stuff
Diffstat (limited to 'pkgs/applications/audio')
-rw-r--r-- | pkgs/applications/audio/lollypop/default.nix | 40 |
1 files changed, 29 insertions, 11 deletions
diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index 565c0b31522..2a790514447 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -1,11 +1,27 @@ -{ stdenv, fetchgit, meson, ninja, pkgconfig -, python3, gtk3, gst_all_1, libsecret, libsoup -, appstream-glib, desktop-file-utils, totem-pl-parser -, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }: +{ lib +, fetchgit +, meson +, ninja +, pkgconfig +, python3 +, gtk3 +, gst_all_1 +, libsecret +, libsoup +, appstream-glib +, desktop-file-utils +, totem-pl-parser +, hicolor-icon-theme +, gobject-introspection +, wrapGAppsHook +, lastFMSupport ? true +, wikipediaSupport ? true +, youtubeSupport ? true, youtube-dl +}: python3.pkgs.buildPythonApplication rec { pname = "lollypop"; - version = "1.0.5"; + version = "1.0.7"; format = "other"; doCheck = false; @@ -14,7 +30,7 @@ python3.pkgs.buildPythonApplication rec { url = "https://gitlab.gnome.org/World/lollypop"; rev = "refs/tags/${version}"; fetchSubmodules = true; - sha256 = "1p6glzvbbha3cvq462ymbn1q58skclfk469kk28cr1hlsf5x2pry"; + sha256 = "0gdds4qssn32axsa5janqny5i4426azj5wyj6bzn026zs3z38svn"; }; nativeBuildInputs = [ @@ -37,10 +53,9 @@ python3.pkgs.buildPythonApplication rec { gstreamer gtk3 hicolor-icon-theme - libsecret libsoup totem-pl-parser - ]; + ] ++ lib.optional lastFMSupport libsecret; propagatedBuildInputs = with python3.pkgs; [ beautifulsoup4 @@ -49,8 +64,11 @@ python3.pkgs.buildPythonApplication rec { pycairo pydbus pygobject3 - pylast - ]; + ] + ++ lib.optional lastFMSupport pylast + ++ lib.optional wikipediaSupport wikipedia + ++ lib.optional youtubeSupport youtube-dl + ; postPatch = '' chmod +x meson_post_install.py @@ -62,7 +80,7 @@ python3.pkgs.buildPythonApplication rec { patchPythonScript "$out/libexec/lollypop-sp" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A modern music player for GNOME"; homepage = https://wiki.gnome.org/Apps/Lollypop; license = licenses.gpl3Plus; |