diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-09-14 05:25:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-14 05:25:13 +0200 |
| commit | 4555a01232534b1bf835c015ed8a204dcf163404 (patch) | |
| tree | d1db39d2ff33f14fc1e754bd2a7d25c62237ebaf | |
| parent | 768c4f637aa11d517c35f0e79270b71d4f2e65b9 (diff) | |
| parent | 494338e04328bb7d34879a070a976b163ba07152 (diff) | |
| download | nixlib-4555a01232534b1bf835c015ed8a204dcf163404.tar nixlib-4555a01232534b1bf835c015ed8a204dcf163404.tar.gz nixlib-4555a01232534b1bf835c015ed8a204dcf163404.tar.bz2 nixlib-4555a01232534b1bf835c015ed8a204dcf163404.tar.lz nixlib-4555a01232534b1bf835c015ed8a204dcf163404.tar.xz nixlib-4555a01232534b1bf835c015ed8a204dcf163404.tar.zst nixlib-4555a01232534b1bf835c015ed8a204dcf163404.zip | |
Merge pull request #46559 from worldofpeace/lollypop-oopsie
lollypop: wrap search provider
| -rw-r--r-- | pkgs/applications/audio/lollypop/default.nix | 45 |
1 files changed, 28 insertions, 17 deletions
diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index 2256fa1893db..6571a45b2a55 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -1,11 +1,15 @@ -{ stdenv, fetchgit, meson, ninja, pkgconfig, wrapGAppsHook -, appstream-glib, desktop-file-utils, gobjectIntrospection -, python36Packages, gnome3, glib, gst_all_1 }: +{ stdenv, fetchgit, meson, ninja, pkgconfig +, python3, gtk3, gst_all_1, libsecret, libsoup +, appstream-glib, desktop-file-utils, gnome3 +, gobjectIntrospection, wrapGAppsHook }: -stdenv.mkDerivation rec { +python3.pkgs.buildPythonApplication rec { version = "0.9.522"; name = "lollypop-${version}"; + format = "other"; + doCheck = false; + src = fetchgit { url = "https://gitlab.gnome.org/World/lollypop"; rev = "refs/tags/${version}"; @@ -13,26 +17,30 @@ stdenv.mkDerivation rec { sha256 = "0f2brwv884cvmxj644jcj9sg5hix3wvnjy2ndg0fh5cxyqz0kwn5"; }; - nativeBuildInputs = with python36Packages; [ + nativeBuildInputs = with python3.pkgs; [ appstream-glib desktop-file-utils gobjectIntrospection meson ninja - python36Packages.python pkgconfig wrapGAppsHook - wrapPython ]; - buildInputs = [ glib ] ++ (with gnome3; [ - 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 + buildInputs = with gst_all_1; [ + gnome3.totem-pl-parser + gst-libav + gst-plugins-bad + gst-plugins-base + gst-plugins-good + gst-plugins-ugly gstreamer - ]); + gtk3 + libsecret + libsoup + ]; - pythonPath = with python36Packages; [ + pythonPath = with python3.pkgs; [ beautifulsoup4 gst-python pillow @@ -42,11 +50,14 @@ stdenv.mkDerivation rec { pylast ]; - postFixup = "wrapPythonPrograms"; - postPatch = '' - chmod +x ./meson_post_install.py - patchShebangs ./meson_post_install.py + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + ''; + + preFixup = '' + buildPythonPath "$out/libexec/lollypop-sp $pythonPath" + patchPythonScript "$out/libexec/lollypop-sp" ''; meta = with stdenv.lib; { |