From eeb9e9473f28b58a4c19caf36497478eba329450 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Tue, 18 Sep 2018 14:42:25 -0400
Subject: [PATCH] lollypop-portal: add python3

---
 pkgs/misc/lollypop-portal/default.nix | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/pkgs/misc/lollypop-portal/default.nix b/pkgs/misc/lollypop-portal/default.nix
index 914888876d23..dfcdebace3b0 100644
--- a/pkgs/misc/lollypop-portal/default.nix
+++ b/pkgs/misc/lollypop-portal/default.nix
@@ -1,11 +1,14 @@
 { stdenv, fetchFromGitLab, meson, ninja, pkgconfig
-, python36Packages, gnome3, gst_all_1, gtk3, libnotify
+, python3, gnome3, gst_all_1, gtk3, libnotify
 , kid3, easytag, gobjectIntrospection, wrapGAppsHook }:
 
-stdenv.mkDerivation rec {
+python3.pkgs.buildPythonApplication rec {
   name = "lollypop-portal-${version}";
   version = "0.9.7";
 
+  format = "other";
+  doCheck = false;
+
   src = fetchFromGitLab {
      domain = "gitlab.gnome.org";
      owner = "gnumdk";
@@ -19,33 +22,31 @@ stdenv.mkDerivation rec {
     meson
     ninja
     pkgconfig
-    python36Packages.wrapPython
     wrapGAppsHook
   ];
 
   buildInputs = [
-    gnome3.totem-pl-parser
-    gnome3.libsecret
     gnome3.gnome-settings-daemon
-
-    gst_all_1.gstreamer
+    gnome3.libsecret
+    gnome3.totem-pl-parser
     gst_all_1.gst-plugins-base
-
+    gst_all_1.gstreamer
     gtk3
     libnotify
+    python3
   ];
 
-  pythonPath = with python36Packages; [
-    pygobject3
-    pydbus
+  pythonPath = with python3.pkgs; [
     pycairo
+    pydbus
+    pygobject3
   ];
 
   preFixup = ''
     buildPythonPath "$out/libexec/lollypop-portal $pythonPath"
+    patchPythonScript "$out/libexec/lollypop-portal"
 
     gappsWrapperArgs+=(
-      --prefix PYTHONPATH : "$program_PYTHONPATH"
       --prefix PATH : "${stdenv.lib.makeBinPath [ easytag kid3 ]}"
     )
   '';