uku/flake
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: fmt

Browse source
This commit is contained in:
uku 2024-09-03 21:28:42 +02:00
parent c67783f92a
commit 6fde270fb8
Signed by: uku
SSH key fingerprint: SHA256:4P0aN6M8ajKukNi6aPOaX0LacanGYtlfjmN+m/sHY/o
3 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
programs/games.nix
View file

@ -7,7 +7,7 @@
hm.home.packages = with pkgs; [ hm.home.packages = with pkgs; [
obs-studio obs-studio
osu-lazer-bin osu-lazer-bin
(vesktop.override {withSystemVencord = false;}) (vesktop.override {withSystemVencord = false;})
(prismlauncher.override { (prismlauncher.override {
jdks = [temurin-bin-21 temurin-bin-17 temurin-bin-8]; jdks = [temurin-bin-21 temurin-bin-17 temurin-bin-8];

6
systems/mottarone/default.nix
View file

@ -1,4 +1,8 @@
{lib, pkgs, ...}: { {
lib,
pkgs,
...
}: {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
chromium chromium
gtkterm gtkterm

25
systems/mottarone/teams.nix
View file

@ -12,7 +12,6 @@
versionCheckHook, versionCheckHook,
which, which,
}: }:
buildNpmPackage rec { buildNpmPackage rec {
pname = "teams-for-linux"; pname = "teams-for-linux";
version = "1.9.5"; version = "1.9.5";
@ -26,10 +25,12 @@ buildNpmPackage rec {
npmDepsHash = "sha256-vDRFFxkIQo5qU9gmkSwUhPz4FG2XbUNkTw6SCuvMqCc="; npmDepsHash = "sha256-vDRFFxkIQo5qU9gmkSwUhPz4FG2XbUNkTw6SCuvMqCc=";
nativeBuildInputs = [ nativeBuildInputs =
makeWrapper [
versionCheckHook makeWrapper
] ++ lib.optionals (stdenv.isLinux) [ copyDesktopItems ]; versionCheckHook
]
++ lib.optionals (stdenv.isLinux) [copyDesktopItems];
doInstallCheck = stdenv.isLinux; doInstallCheck = stdenv.isLinux;
@ -74,11 +75,11 @@ buildNpmPackage rec {
# Linux needs 'aplay' for notification sounds # Linux needs 'aplay' for notification sounds
makeWrapper '${lib.getExe electron_30}' "$out/bin/teams-for-linux" \ makeWrapper '${lib.getExe electron_30}' "$out/bin/teams-for-linux" \
--prefix PATH : ${ --prefix PATH : ${
lib.makeBinPath [ lib.makeBinPath [
alsa-utils alsa-utils
which which
] ]
} \ } \
--add-flags "$out/share/teams-for-linux/app.asar" \ --add-flags "$out/share/teams-for-linux/app.asar" \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
'' ''
@ -107,7 +108,7 @@ buildNpmPackage rec {
}) })
]; ];
passthru.updateScript = nix-update-script { }; passthru.updateScript = nix-update-script {};
meta = { meta = {
description = "Unofficial Microsoft Teams client for Linux"; description = "Unofficial Microsoft Teams client for Linux";
@ -122,4 +123,4 @@ buildNpmPackage rec {
]; ];
platforms = with lib.platforms; darwin ++ linux; platforms = with lib.platforms; darwin ++ linux;
}; };
} }