diff --git a/pkgs/by-name/va/variety/package.nix b/pkgs/by-name/va/variety/package.nix index 1b98091f108d..6e48e01d7e2d 100644 --- a/pkgs/by-name/va/variety/package.nix +++ b/pkgs/by-name/va/variety/package.nix @@ -1,5 +1,6 @@ { lib, + python3Packages, fetchFromGitHub, gexiv2, gobject-introspection, @@ -8,7 +9,6 @@ intltool, libnotify, librsvg, - python3, runtimeShell, wrapGAppsHook3, fehSupport ? false, @@ -17,9 +17,10 @@ imagemagick, appindicatorSupport ? true, libayatana-appindicator, + bash, }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "variety"; version = "0.8.13"; @@ -44,8 +45,8 @@ python3.pkgs.buildPythonApplication rec { librsvg ] ++ lib.optional appindicatorSupport libayatana-appindicator; - propagatedBuildInputs = - with python3.pkgs; + dependencies = + with python3Packages; [ beautifulsoup4 configobj @@ -73,14 +74,17 @@ python3.pkgs.buildPythonApplication rec { prePatch = '' substituteInPlace variety_lib/varietyconfig.py \ - --replace "__variety_data_directory__ = \"../data\"" \ + --replace-fail "__variety_data_directory__ = \"../data\"" \ "__variety_data_directory__ = \"$out/share/variety\"" substituteInPlace variety/VarietyWindow.py \ - --replace '[script,' '["${runtimeShell}", script,' \ - --replace 'check_output(script)' 'check_output(["${runtimeShell}", script])' + --replace-fail '[script,' '["${runtimeShell}", script,' \ + --replace-fail 'check_output(script)' 'check_output(["${runtimeShell}", script])' + substituteInPlace data/variety-autostart.desktop.template \ + --replace-fail "/bin/bash" "${lib.getExe bash}" \ + --replace-fail "{VARIETY_PATH}" "variety" ''; - meta = with lib; { + meta = { homepage = "https://github.com/varietywalls/variety"; description = "Wallpaper manager for Linux systems"; mainProgram = "variety"; @@ -96,8 +100,8 @@ python3.pkgs.buildPythonApplication rec { Variety also includes a range of image effects, such as oil painting and blur, as well as options to layer quotes and a clock onto the background. ''; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ p3psi zfnmxt ];