From 3f2f086616eed3ca9916d708b56310111be29c5b Mon Sep 17 00:00:00 2001 From: p3psi Date: Fri, 4 Jun 2021 20:16:19 +0800 Subject: [PATCH 1/2] variety: fixed GLib-GIO-ERROR error --- pkgs/applications/misc/variety/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/variety/default.nix b/pkgs/applications/misc/variety/default.nix index 2366d04b9ca1..c9e3a86487d9 100644 --- a/pkgs/applications/misc/variety/default.nix +++ b/pkgs/applications/misc/variety/default.nix @@ -10,6 +10,7 @@ , hicolor-icon-theme , librsvg , wrapGAppsHook +, makeWrapper }: with python37Packages; @@ -27,10 +28,12 @@ buildPythonApplication rec { nativeBuildInputs = [ intltool wrapGAppsHook ]; - buildInputs = [ distutils_extra ]; + buildInputs = [ makeWrapper distutils_extra ]; doCheck = false; + postInstall = "wrapProgram $out/bin/variety --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/"; + prePatch = '' substituteInPlace variety_lib/varietyconfig.py \ --replace "__variety_data_directory__ = \"../data\"" "__variety_data_directory__ = \"$out/share/variety\"" @@ -76,7 +79,7 @@ buildPythonApplication rec { blur, as well as options to layer quotes and a clock onto the background. ''; license = licenses.gpl3; - maintainers = with maintainers; [ AndersonTorres zfnmxt ]; + maintainers = with maintainers; [ p3psi AndersonTorres zfnmxt ]; platforms = with platforms; linux; }; } From cf69e3dc605b2d213989c4e339459ed3ad3575e8 Mon Sep 17 00:00:00 2001 From: p3psi <43925055+p3psi-boo@users.noreply.github.com> Date: Sun, 13 Jun 2021 12:17:29 +0800 Subject: [PATCH 2/2] Update pkgs/applications/misc/variety/default.nix Co-authored-by: Sandro --- pkgs/applications/misc/variety/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/variety/default.nix b/pkgs/applications/misc/variety/default.nix index c9e3a86487d9..5e7765a16fde 100644 --- a/pkgs/applications/misc/variety/default.nix +++ b/pkgs/applications/misc/variety/default.nix @@ -32,7 +32,9 @@ buildPythonApplication rec { doCheck = false; - postInstall = "wrapProgram $out/bin/variety --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/"; + postInstall = '' + wrapProgram $out/bin/variety --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/ + ''; prePatch = '' substituteInPlace variety_lib/varietyconfig.py \