diff --git a/pkgs/development/python-modules/pywal/convert.patch b/pkgs/development/python-modules/pywal/convert.patch new file mode 100644 index 00000000000..999bc1abeaf --- /dev/null +++ b/pkgs/development/python-modules/pywal/convert.patch @@ -0,0 +1,21 @@ +diff --git a/pywal/backends/wal.py b/pywal/backends/wal.py +index a75fdc5..4339680 100644 +--- a/pywal/backends/wal.py ++++ b/pywal/backends/wal.py +@@ -21,15 +21,7 @@ def imagemagick(color_count, img, magick_command): + + def has_im(): + """Check to see if the user has im installed.""" +- if shutil.which("magick"): +- return ["magick", "convert"] +- +- if shutil.which("convert"): +- return ["convert"] +- +- logging.error("Imagemagick wasn't found on your system.") +- logging.error("Try another backend. (wal --backend)") +- sys.exit(1) ++ return ["@convert@"] + + + def gen_colors(img): diff --git a/pkgs/tools/graphics/pywal/default.nix b/pkgs/development/python-modules/pywal/default.nix similarity index 82% rename from pkgs/tools/graphics/pywal/default.nix rename to pkgs/development/python-modules/pywal/default.nix index 4d493bdd73e..799a018e539 100644 --- a/pkgs/tools/graphics/pywal/default.nix +++ b/pkgs/development/python-modules/pywal/default.nix @@ -19,6 +19,14 @@ python3Packages.buildPythonApplication rec { HOME=$PWD/tmp ''; + patches = [ + ./convert.patch + ]; + + postPatch = '' + substituteInPlace pywal/backends/wal.py --subst-var-by convert "${imagemagick}/bin/convert" + ''; + meta = with lib; { description = "Generate and change colorschemes on the fly. A 'wal' rewrite in Python 3."; homepage = https://github.com/dylanaraps/pywal; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dbf1c2e4e39..9f9e963caac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5017,7 +5017,7 @@ in pytrainer = callPackage ../applications/misc/pytrainer { }; - pywal = callPackage ../tools/graphics/pywal {}; + pywal = with python3Packages; toPythonApplication pywal; remarshal = callPackage ../development/tools/remarshal { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d3e384d8ed2..a377046c990 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3733,6 +3733,8 @@ in { pyutil = callPackage ../development/python-modules/pyutil { }; + pywal = callPackage ../development/python-modules/pywal { }; + pywebkitgtk = callPackage ../development/python-modules/pywebkitgtk { }; pywinrm = callPackage ../development/python-modules/pywinrm { };