sadorowo/schildichat-desktop
1
0
Fork 0
forked from github/schildichat-desktop
Code Pull Requests Activity

remove clutter

Browse Source
This commit is contained in:
Franek 2025-04-17 19:55:49 +02:00
parent c250c5db8e
commit 55c4f44c2c
3 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
element-web

@ -1 +0,0 @@
Subproject commit 904c6378682d314fe91bf536b6207c6d5e320459

17
flake.nix
View File

@ -7,7 +7,7 @@
systems = [ "x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; systems = [ "x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
forAllSystems = f: nixpkgs.lib.genAttrs systems (system: f system); forAllSystems = f: nixpkgs.lib.genAttrs systems (system: f system);
in { in {
packages = forAllSystems(system: { packages = forAllSystems(system: let
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
cleanSource = src: with pkgs.lib; cleanSourceWith { cleanSource = src: with pkgs.lib; cleanSourceWith {
filter = name: type: cleanSourceFilter name type filter = name: type: cleanSourceFilter name type
@ -16,22 +16,15 @@
inherit src; inherit src;
}; };
in {
schildichat-web = import ./nix/schildichat-web.nix { schildichat-web = import ./nix/schildichat-web.nix { inherit pkgs cleanSource; };
inherit (pkgs.darwin.apple_sdk.frameworks) Security AppKit CoreServices; schildichat-desktop = import ./nix/schildichat-desktop.nix { inherit pkgs cleanSource; };
inherit pkgs cleanSource;
};
schildichat-desktop = import ./nix/schildichat-desktop.nix {
inherit (pkgs.darwin.apple_sdk.frameworks) Security AppKit CoreServices;
inherit pkgs cleanSource;
};
schildichat-desktop-wayland = self.packages.${system}.schildichat-desktop { schildichat-desktop-wayland = self.packages.${system}.schildichat-desktop {
useWayland = true; useWayland = true;
}; };
default = self.packages.${system}.schildichat-desktop default = self.packages.${system}.schildichat-desktop;
}); });
}; };
} }

7
nix/schildichat-desktop.nix
View File

@ -5,7 +5,6 @@
}: }:
let let
inherit (pkgs.nodePackages) mkYarnPackage;
inherit (pkgs.darwin.apple_sdk.frameworks) Security AppKit CoreServices; inherit (pkgs.darwin.apple_sdk.frameworks) Security AppKit CoreServices;
schildichat-web = pkgs.callPackage ./schildichat-web.nix { inherit pkgs cleanSource; }; schildichat-web = pkgs.callPackage ./schildichat-web.nix { inherit pkgs cleanSource; };
@ -14,11 +13,11 @@ let
yarnLock = schildichat-desktop-src + "/element-desktop/yarn.lock"; yarnLock = schildichat-desktop-src + "/element-desktop/yarn.lock";
version = builtins.fromJSON (builtins.readFile packageJSON).version; version = builtins.fromJSON (builtins.readFile packageJSON).version;
electron_exec = if stdenv.isDarwin then electron_exec = if pkgs.stdenv.isDarwin then
"${pkgs.electron}/Applications/Electron.app/Contents/MacOS/Electron" "${pkgs.electron}/Applications/Electron.app/Contents/MacOS/Electron"
else else
"${pkgs.electron}/bin/electron"; "${pkgs.electron}/bin/electron";
in mkYarnPackage { in pkgs.mkYarnPackage {
pname = "schildichat-desktop"; pname = "schildichat-desktop";
src = cleanSource (schildichat-desktop-src + "/element-desktop"); src = cleanSource (schildichat-desktop-src + "/element-desktop");
@ -65,6 +64,6 @@ in mkYarnPackage {
done done
makeWrapper '${electron_exec}' "$out/bin/schildichat-desktop" \ makeWrapper '${electron_exec}' "$out/bin/schildichat-desktop" \
--add-flags "$out/share/element/electron${lib.optionalString useWayland " --enable-features=UseOzonePlatform --ozone-platform=wayland"}" --add-flags "$out/share/element/electron${pkgs.lib.optionalString useWayland " --enable-features=UseOzonePlatform --ozone-platform=wayland"}"
''; '';
} }