From edd290e314c5d2c626969bce5eb7117e55851a57 Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Wed, 24 Jul 2024 15:17:21 +0200 Subject: [PATCH] Clan-app: devshell add schemas for gtk4; gsettings --- pkgs/clan-app/default.nix | 4 ++-- pkgs/clan-app/shell.nix | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/clan-app/default.nix b/pkgs/clan-app/default.nix index 21eb1af54..a8e6bcf97 100644 --- a/pkgs/clan-app/default.nix +++ b/pkgs/clan-app/default.nix @@ -4,7 +4,7 @@ setuptools, copyDesktopItems, pygobject3, - wrapGAppsHook, + wrapGAppsHook4, gtk4, adwaita-icon-theme, pygobject-stubs, @@ -84,7 +84,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ setuptools copyDesktopItems - wrapGAppsHook + wrapGAppsHook4 gobject-introspection ]; diff --git a/pkgs/clan-app/shell.nix b/pkgs/clan-app/shell.nix index f1043fd82..7d123a9b4 100644 --- a/pkgs/clan-app/shell.nix +++ b/pkgs/clan-app/shell.nix @@ -1,5 +1,7 @@ { lib, + glib, + gsettings-desktop-schemas, stdenv, clan-app, mkShell, @@ -33,7 +35,9 @@ mkShell { buildInputs = [ + glib ruff + gtk4 gtk4.dev # has the demo called 'gtk4-widget-factory' libadwaita.devdoc # has the demo called 'adwaita-1-demo' ] @@ -60,6 +64,9 @@ mkShell { # Add clan-cli to the python path so that we can import it without building it in nix first export PYTHONPATH="$GIT_ROOT/pkgs/clan-cli":"$PYTHONPATH" + export XDG_DATA_DIRS=${gtk4}/share/gsettings-schemas/gtk4-4.14.4:$XDG_DATA_DIRS + export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/gsettings-desktop-schemas-46.0:$XDG_DATA_DIRS + # Add the webview-ui to the .webui directory ln -nsf ${webview-ui}/lib/node_modules/@clan/webview-ui/dist/ ./clan_app/.webui