From 6aefeb06c15a5a55d28f5e4a35ac7a0d1f245f61 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Tue, 8 Aug 2023 17:54:51 +0200 Subject: [PATCH] chore: debug banana-accounting on wayland --- nix/devShells.nix | 32 +++++++++++++++++++ nix/home-manager/profiles/wayland-desktop.nix | 9 +++--- nix/os/devices/steveej-t14/pkg.nix | 1 - 3 files changed, 37 insertions(+), 5 deletions(-) diff --git a/nix/devShells.nix b/nix/devShells.nix index e43a970..34dfceb 100644 --- a/nix/devShells.nix +++ b/nix/devShells.nix @@ -66,6 +66,38 @@ pkgs.stdenv.mkDerivation { ntfy hedgedoc-cli + + xwayland + (banana-accounting.overrideDerivation (attrs: + with inputs'.nixpkgs-2211.legacyPackages; { + # dontWrapGApps = true; + + srcs = builtins.fetchurl { + # hosted via https://web3.storage + url = "https://bafybeiabi4m2i4izummipbl5wzhwxjyjt2rylgsrahhkh7i63piwd37n4u.ipfs.w3s.link/mfpcksczayaqqx8fdacp0627zm36c001-bananaplus.tgz"; + + sha256 = "09666iqzqdw2526pf6bg5kd0hfw0wblw8ag636ki72dsiw6bmbf1"; + }; + + # nativeBuildInputs = + # attrs.nativeBuildInputs + # ++ [ + # qt5.qtbase + # qt5.wrapQtAppsHook + # ]; + + # buildInputs = + # attrs.buildInputs + # ++ [ + # qt5.qtwayland + # ]; + + # preFixup = + # (attrs.preFixup or "") + # + '' + # qtWrapperArgs+=("''${gappsWrapperArgs[@]}") + # ''; + })) ]); # Set Environment Variables diff --git a/nix/home-manager/profiles/wayland-desktop.nix b/nix/home-manager/profiles/wayland-desktop.nix index 63d90c5..6c4d820 100644 --- a/nix/home-manager/profiles/wayland-desktop.nix +++ b/nix/home-manager/profiles/wayland-desktop.nix @@ -54,13 +54,14 @@ in { pavucontrol playerctl pasystray - # qt5.qtwayland - # qt6.qtwayland + qt5.qtwayland + qt6.qtwayland + # libsForQt5.qt5.qtwayland + # libsForQt6.qt6.qtwayland # probably required by flameshot - # xdg-desktop-portal xdg-desktop-portal-wlr + # xdg-desktop-portal xdg-desktop-portal-wlr # grim - ]; home.sessionVariables = { diff --git a/nix/os/devices/steveej-t14/pkg.nix b/nix/os/devices/steveej-t14/pkg.nix index 7f16eac..95dc2d4 100644 --- a/nix/os/devices/steveej-t14/pkg.nix +++ b/nix/os/devices/steveej-t14/pkg.nix @@ -20,7 +20,6 @@ }; home.packages = with pkgs; [ - banana-accounting ]; };