From 4204d0df92eee5732fdaca404b6f5688e732b115 Mon Sep 17 00:00:00 2001 From: Kopatz <7265381+Kropatz@users.noreply.github.com> Date: Tue, 26 Mar 2024 10:58:30 +0100 Subject: [PATCH] fix tetrio plus --- modules/graphical/shared.nix | 7 +------ pkgs/tetrio-desktop/package.nix | 5 ++++- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/modules/graphical/shared.nix b/modules/graphical/shared.nix index 7158621..9cfc0cc 100644 --- a/modules/graphical/shared.nix +++ b/modules/graphical/shared.nix @@ -4,13 +4,8 @@ let screenshot = pkgs.writeShellScriptBin "screenshot.sh" '' ${pkgs.scrot}/bin/scrot -fs - | ${pkgs.xclip}/bin/xclip -selection clipboard -t image/png -i ''; - tetrioPlus = pkgs.tetrio.overrideAttrs (old: { - withTetrioPlus = true; - }); in { - - programs.dconf.enable = true; programs.kdeconnect.enable = true; @@ -51,7 +46,7 @@ in rofi localsend element-desktop - tetrioPlus + tetrio krita unstable.libreoffice-fresh mangohud diff --git a/pkgs/tetrio-desktop/package.nix b/pkgs/tetrio-desktop/package.nix index 50663b4..7791e09 100644 --- a/pkgs/tetrio-desktop/package.nix +++ b/pkgs/tetrio-desktop/package.nix @@ -16,6 +16,7 @@ , libpulseaudio , systemd , callPackage +, withTetrioPlus ? true , tetrio-plus ? callPackage ./tetrio-plus.nix { } , ... }: @@ -70,7 +71,9 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - + postInstall = lib.strings.optionalString withTetrioPlus '' + cp ${tetrio-plus} $out/opt/TETR.IO/resources/app.asar + ''; postFixup = '' wrapProgram $out/opt/TETR.IO/TETR.IO \