diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-09-18 21:24:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-18 21:24:42 +0200 |
| commit | 4bc023b5833e32f261f321fc736f745c62aae57c (patch) | |
| tree | 43b30edfad32729fa2ee58bd2f1adae8af84fb68 | |
| parent | 943871a8666afb00136964945b411a317e2542ef (diff) | |
| parent | eeb9e9473f28b58a4c19caf36497478eba329450 (diff) | |
| download | nixlib-4bc023b5833e32f261f321fc736f745c62aae57c.tar nixlib-4bc023b5833e32f261f321fc736f745c62aae57c.tar.gz nixlib-4bc023b5833e32f261f321fc736f745c62aae57c.tar.bz2 nixlib-4bc023b5833e32f261f321fc736f745c62aae57c.tar.lz nixlib-4bc023b5833e32f261f321fc736f745c62aae57c.tar.xz nixlib-4bc023b5833e32f261f321fc736f745c62aae57c.tar.zst nixlib-4bc023b5833e32f261f321fc736f745c62aae57c.zip | |
Merge pull request #46849 from worldofpeace/lollypop-portal/fix-build
lollypop-portal: add python3
| -rw-r--r-- | pkgs/misc/lollypop-portal/default.nix | 25 |
1 files 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 ]}" ) ''; |