From 769f42b8646b75c8fb306806b39dd32a8c11a191 Mon Sep 17 00:00:00 2001 From: Daniel Barlow Date: Tue, 18 Jan 2022 17:41:58 +0000 Subject: [PATCH] make dbus activation work for saturn --- saturn/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/saturn/default.nix b/saturn/default.nix index cab939d..83a936a 100644 --- a/saturn/default.nix +++ b/saturn/default.nix @@ -37,12 +37,6 @@ let fennel = fetchurl { ''; }; - serviceFile = out: writeText "squeekboard.service" '' - [D-BUS Service] - Name=net.telent.saturn - Exec=${out}/bin/saturn - ''; - lua = lua5_3.withPackages (ps: with ps; [ dbusProxy inifile @@ -68,7 +62,13 @@ in stdenv.mkDerivation { # my machine postInstall = '' mkdir -p $out/share/dbus-1/services - cp ${serviceFile (placeholder "out")} $out/share/dbus-1/services/net.telent.saturn.service + + cat < $out/share/dbus-1/services/net.telent.saturn.service + [D-BUS Service] + Name=net.telent.saturn + Exec=$out/bin/saturn + SERVICE + wrapProgram $out/bin/saturn --set GDK_PIXBUF_MODULE_FILE ${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache --set GI_TYPELIB_PATH "$GI_TYPELIB_PATH" ''; }