From f772b8d2983ff75d460ab1d85fe067ccef866fb7 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 31 Dec 2017 01:50:56 +0100 Subject: [PATCH] udiskie: Use python3 (python2 support is deprecated) --- pkgs/applications/misc/udiskie/default.nix | 13 +++++++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix index a8da6c02f25..2688786aabc 100644 --- a/pkgs/applications/misc/udiskie/default.nix +++ b/pkgs/applications/misc/udiskie/default.nix @@ -1,8 +1,13 @@ { stdenv, fetchFromGitHub, asciidoc-full, gettext , gobjectIntrospection, gtk3, hicolor_icon_theme, libnotify, librsvg -, pythonPackages, udisks2, wrapGAppsHook }: +, udisks2, wrapGAppsHook +, buildPythonApplication +, docopt +, pygobject3 +, pyyaml +}: -pythonPackages.buildPythonApplication rec { +buildPythonApplication rec { name = "udiskie-${version}"; version = "1.7.3"; @@ -21,8 +26,8 @@ pythonPackages.buildPythonApplication rec { ]; propagatedBuildInputs = [ - gettext gobjectIntrospection gtk3 libnotify pythonPackages.docopt - pythonPackages.pygobject3 pythonPackages.pyyaml udisks2 + gettext gobjectIntrospection gtk3 libnotify docopt + pygobject3 pyyaml udisks2 ]; postBuild = "make -C doc"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2dbe29eb869..1445d099f8e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16744,7 +16744,7 @@ with pkgs; udevil = callPackage ../applications/misc/udevil {}; - udiskie = callPackage ../applications/misc/udiskie { }; + udiskie = python3Packages.callPackage ../applications/misc/udiskie { }; sakura = callPackage ../applications/misc/sakura { vte = gnome3.vte;