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

fix flake files

Browse Source
This commit is contained in:
Franek 2025-04-17 16:28:43 +02:00
parent 9440e2b9bc
commit c250c5db8e
3 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
flake.nix
View File

@ -9,15 +9,22 @@
in { in {
packages = forAllSystems(system: { packages = forAllSystems(system: {
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
cleanSource = src: with pkgs.lib; cleanSourceWith {
filter = name: type: cleanSourceFilter name type
&& !(hasInfix "/node_modules/" name)
&& !(hasInfix "/nix/" name && hasSuffix ".nix" name);
inherit src;
};
schildichat-web = import ./nix/schildichat-web.nix { schildichat-web = import ./nix/schildichat-web.nix {
inherit (final.darwin.apple_sdk.frameworks) Security AppKit CoreServices; inherit (pkgs.darwin.apple_sdk.frameworks) Security AppKit CoreServices;
inherit pkgs; inherit pkgs cleanSource;
}; };
schildichat-desktop = import ./nix/schildichat-desktop.nix { schildichat-desktop = import ./nix/schildichat-desktop.nix {
inherit (final.darwin.apple_sdk.frameworks) Security AppKit CoreServices; inherit (pkgs.darwin.apple_sdk.frameworks) Security AppKit CoreServices;
inherit pkgs; inherit pkgs cleanSource;
}; };
schildichat-desktop-wayland = self.packages.${system}.schildichat-desktop { schildichat-desktop-wayland = self.packages.${system}.schildichat-desktop {

7
nix/schildichat-desktop.nix
View File

@ -1,4 +1,5 @@
{ pkgs { pkgs
, cleanSource
, schildichat-desktop-src ? ../. , schildichat-desktop-src ? ../.
, useWayland ? false , useWayland ? false
}: }:
@ -7,16 +8,16 @@ let
inherit (pkgs.nodePackages) mkYarnPackage; 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; }; schildichat-web = pkgs.callPackage ./schildichat-web.nix { inherit pkgs cleanSource; };
packageJSON = schildichat-desktop-src + "/element-desktop/package.json"; packageJSON = schildichat-desktop-src + "/element-desktop/package.json";
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 stdenv.isDarwin then
"${electron}/Applications/Electron.app/Contents/MacOS/Electron" "${pkgs.electron}/Applications/Electron.app/Contents/MacOS/Electron"
else else
"${electron}/bin/electron"; "${pkgs.electron}/bin/electron";
in mkYarnPackage { in mkYarnPackage {
pname = "schildichat-desktop"; pname = "schildichat-desktop";
src = cleanSource (schildichat-desktop-src + "/element-desktop"); src = cleanSource (schildichat-desktop-src + "/element-desktop");

9
nix/schildichat-web.nix
View File

@ -1,13 +1,14 @@
{ pkgs, schildichat-desktop-src ? ../. }: { pkgs
, cleanSource
, schildichat-desktop-src ? ../. }:
let let
version = lib.importJSON "${schildichat-desktop-src}/element-web/package.json".version; version = pkgs.lib.importJSON "${schildichat-desktop-src}/element-web/package.json".version;
in pkgs.stdenv.mkDerivation { in pkgs.stdenv.mkDerivation {
pname = "schildichat-web"; pname = "schildichat-web";
inherit version; inherit version;
src = pkgs.cleanSource schildichat-desktop-src; src = cleanSource schildichat-desktop-src;
nativeBuildInputs = with pkgs; [ nodejs yarn ]; nativeBuildInputs = with pkgs; [ nodejs yarn ];
buildPhase = '' buildPhase = ''