From 8862d554c7eca04d8f1a5caeffd99933ab6b6b5e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 26 Dec 2018 12:01:20 +0100 Subject: [PATCH] wpgtk: use python37 and fix dependency on pywal --- pkgs/tools/X11/wpgtk/default.nix | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/X11/wpgtk/default.nix b/pkgs/tools/X11/wpgtk/default.nix index 374d3e112ca1..2c8306a25afd 100644 --- a/pkgs/tools/X11/wpgtk/default.nix +++ b/pkgs/tools/X11/wpgtk/default.nix @@ -1,7 +1,7 @@ -{ stdenv, python36Packages, fetchFromGitHub, pywal, feh, libxslt, imagemagick, +{ stdenv, python3Packages, fetchFromGitHub, feh, libxslt, gobject-introspection, gtk3, wrapGAppsHook, gnome3 }: -python36Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "wpgtk"; version = "5.7.4"; @@ -12,13 +12,6 @@ python36Packages.buildPythonApplication rec { sha256 = "0c0kmc18lbr7nk3hh44hai9z06lfsgwxnjdv02hpjwrxg40zh726"; }; - pythonPath = [ - python36Packages.pygobject3 - python36Packages.pillow - pywal - imagemagick - ]; - buildInputs = [ wrapGAppsHook gtk3 @@ -27,11 +20,20 @@ python36Packages.buildPythonApplication rec { libxslt ]; + propagatedBuildInputs = with python3Packages; [ + pygobject3 + pillow + pywal + ]; + # The $HOME variable must be set to build the package. A "permission denied" error will occur otherwise preBuild = '' export HOME=$(pwd) ''; + # No test exist + doCheck = false; + meta = with stdenv.lib; { description = "Template based wallpaper/colorscheme generator and manager"; longDescription = ''