Merge pull request #189624 from linsui/variety (666876ba) · Commits · nix / nixpkgs

pkgs/applications/misc/variety/default.nix

+21 −14

Original line number	Diff line number	Diff line
		@@ -11,8 +11,10 @@
		, python3
		, runtimeShell
		, wrapGAppsHook
		, fehSupport ? false, feh
		, imagemagickSupport ? true, imagemagick
		, fehSupport ? false
		, feh
		, imagemagickSupport ? true
		, imagemagick
		}:

		python3.pkgs.buildPythonApplication rec {
		@@ -29,17 +31,19 @@ python3.pkgs.buildPythonApplication rec {
		nativeBuildInputs = [
		intltool
		wrapGAppsHook
		gobject-introspection
		];

		propagatedBuildInputs = [
		buildInputs = [
		gexiv2
		gobject-introspection
		gtk3
		hicolor-icon-theme
		libnotify
		librsvg
		]
		++ (with python3.pkgs; [
		];

		propagatedBuildInputs = with python3.pkgs; [
		beautifulsoup4
		configobj
		dbus-python
		@@ -51,14 +55,17 @@ python3.pkgs.buildPythonApplication rec {
		pygobject3
		requests
		setuptools
		])
		]
		++ lib.optional fehSupport feh
		++ lib.optional imagemagickSupport imagemagick;

		doCheck = false;

		postInstall = ''
		wrapProgram $out/bin/variety --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/
		# Prevent double wrapping, let the Python wrapper use the args in preFixup.
		dontWrapGApps = true;

		preFixup = ''
		makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
		'';

		prePatch = ''