summary refs log tree commit diff
path: root/pkgs/applications/audio/lollypop
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@users.noreply.github.com>2018-09-12 02:07:39 -0400
committerworldofpeace <worldofpeace@users.noreply.github.com>2018-09-12 02:07:39 -0400
commit494338e04328bb7d34879a070a976b163ba07152 (patch)
tree4bdaf03926d1cf7714335f5c5225ea05b7f141ea /pkgs/applications/audio/lollypop
parenta25dcb66077310067ca1b59b2f38046bee752b0a (diff)
downloadnixpkgs-494338e04328bb7d34879a070a976b163ba07152.tar
nixpkgs-494338e04328bb7d34879a070a976b163ba07152.tar.gz
nixpkgs-494338e04328bb7d34879a070a976b163ba07152.tar.bz2
nixpkgs-494338e04328bb7d34879a070a976b163ba07152.tar.lz
nixpkgs-494338e04328bb7d34879a070a976b163ba07152.tar.xz
nixpkgs-494338e04328bb7d34879a070a976b163ba07152.tar.zst
nixpkgs-494338e04328bb7d34879a070a976b163ba07152.zip
lollypop: wrap search provider
Diffstat (limited to 'pkgs/applications/audio/lollypop')
-rw-r--r--pkgs/applications/audio/lollypop/default.nix45
1 files changed, 28 insertions, 17 deletions
diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix
index 2256fa1893d..6571a45b2a5 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; {