From 8edb7f27c3730d41f4c3cbcb47ef3e76c23d89b7 Mon Sep 17 00:00:00 2001 From: Martino Fontana Date: Mon, 8 Aug 2022 18:35:28 +0200 Subject: [PATCH] caffeine-ng: don't double wrap --- pkgs/tools/X11/caffeine-ng/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/X11/caffeine-ng/default.nix b/pkgs/tools/X11/caffeine-ng/default.nix index 619bd55b6f45..5aab492c75e8 100644 --- a/pkgs/tools/X11/caffeine-ng/default.nix +++ b/pkgs/tools/X11/caffeine-ng/default.nix @@ -45,7 +45,6 @@ in buildPythonApplication rec { buildInputs = [ libappindicator-gtk3 libnotify - gobject-introspection gtk3 ]; @@ -60,6 +59,8 @@ in buildPythonApplication rec { ]; doCheck = false; # There are no tests. + dontWrapGApps = true; + strictDeps = false; postInstall = '' cp -r share $out/ @@ -69,10 +70,13 @@ in buildPythonApplication rec { ln -s $out/${python3.sitePackages}/etc $out/etc glib-compile-schemas --strict $out/share/glib-2.0/schemas + ''; + preFixup = '' gappsWrapperArgs+=( --prefix PATH : ${lib.makeBinPath [ procps xautolock xscreensaver xfce.xfconf xset ]} ) + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; meta = with lib; {