asmir/nixos_flake_config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zapzap: move to upstream package

Browse Source
This commit is contained in:
Asmir A 2024-03-23 17:50:07 +01:00
parent 8c29c37f5a
commit bcf1b737b0
Signed by: asmir
GPG Key ID: 020C42B7A9ABA3E2
4 changed files with 2 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
home/home_packages.nix
View File

@ -100,13 +100,13 @@ in {
x2goclient x2goclient
yewtube yewtube
yt-dlp yt-dlp
zapzap
zathura zathura
zeal-qt6 zeal-qt6
zig zig
] ]
++ [ ++ [
inputs.swaysw.packages.${system}.swaysw inputs.swaysw.packages.${system}.swaysw
(pkgs.callPackage ../packages/zapzap/default.nix {})
(pkgs.callPackage ../packages/viber/default.nix {}) (pkgs.callPackage ../packages/viber/default.nix {})
(pkgs.callPackage ../packages/bubblewrap/default.nix {}) (pkgs.callPackage ../packages/bubblewrap/default.nix {})
]; ];

3
home/sway.nix
View File

@ -17,7 +17,6 @@
${pkgs.grim}/bin/grim -g "$GEOM" - | ${pkgs.wl-clipboard}/bin/wl-copy ${pkgs.grim}/bin/grim -g "$GEOM" - | ${pkgs.wl-clipboard}/bin/wl-copy
''; '';
swaysw = inputs.swaysw.packages.${system}.swaysw; swaysw = inputs.swaysw.packages.${system}.swaysw;
zapzap = pkgs.callPackage ../packages/zapzap/default.nix {};
viber = pkgs.callPackage ../packages/viber/default.nix {}; viber = pkgs.callPackage ../packages/viber/default.nix {};
term = "${pkgs.foot}/bin/footclient"; term = "${pkgs.foot}/bin/footclient";
in { in {
@ -125,7 +124,7 @@ in {
"Mod4+l" = '' "Mod4+l" = ''
exec ${pkgs.sway}/bin/swaymsg [app_id="python3"] scratchpad show || exec ${term} -a python3 ${pkgs.python3}/bin/python3''; exec ${pkgs.sway}/bin/swaymsg [app_id="python3"] scratchpad show || exec ${term} -a python3 ${pkgs.python3}/bin/python3'';
"Mod4+h" = "exec ${pkgs.sway}/bin/swaymsg [app_id=com.rtosta.zapzap] scratchpad show || exec ${zapzap}/bin/zapzap"; "Mod4+h" = "exec ${pkgs.sway}/bin/swaymsg [app_id=com.rtosta.zapzap] scratchpad show || exec ${pkgs.zapzap}/bin/zapzap";
"Mod4+j" = "exec ${pkgs.sway}/bin/swaymsg [app_id=com.viber] scratchpad show || exec ${viber}/bin/viber"; "Mod4+j" = "exec ${pkgs.sway}/bin/swaymsg [app_id=com.viber] scratchpad show || exec ${viber}/bin/viber";
"Mod4+y" = '' "Mod4+y" = ''
exec ${pkgs.sway}/bin/swaymsg [app_id="pulsemixer"] scratchpad show || exec ${term} -a pulsemixer ${pkgs.pulsemixer}/bin/pulsemixer''; exec ${pkgs.sway}/bin/swaymsg [app_id="pulsemixer"] scratchpad show || exec ${term} -a pulsemixer ${pkgs.pulsemixer}/bin/pulsemixer'';

1
packages/zapzap/.nixd.json
View File

@ -1 +0,0 @@
../../.nixd.json

27
packages/zapzap/default.nix
View File

@ -1,27 +0,0 @@
{ fetchurl
, makeWrapper
, python3Packages
, qt6
}:
python3Packages.buildPythonPackage rec {
name = "zapzap";
version = "5.2.1";
src = fetchurl {
url = "https://github.com/zapzap-linux/zapzap/archive/refs/tags/${version}.tar.gz";
hash = "sha256-qJ1gsEJokSPQalcmKRNv1k5m7u4R54LGw4axtZ4P7Zg=";
};
dontWrapQtApps = true;
propagatedBuildInputs = with python3Packages; [ pyqt6-webengine qt6.qtwayland qt6.qtsvg ];
nativeBuildInputs = [ qt6.wrapQtAppsHook makeWrapper ];
env = {
HOME = "/tmp";
};
preFixup = ''
makeWrapperArgs+=(
# Force the app to use QT_PLUGIN_PATH values from wrapper
--unset QT_PLUGIN_PATH
"''${qtWrapperArgs[@]}"
)
'';
}