chore: refactor code

This commit is contained in:
Chris Kruining 2025-11-27 11:05:35 +01:00
parent be346e0e29
commit 829a8dab4e
No known key found for this signature in database
GPG key ID: EB894A3560CCCAD2
2 changed files with 78 additions and 60 deletions

View file

@ -1,15 +1,12 @@
{ lib, inputs, fetchFromGitHub, pkgs, stdenv, ... }:
let
erl = pkgs.beam.interpreters.erlang_28;
erlangPackages = pkgs.beam.packagesWith erl;
elixir = erlangPackages.elixir;
mix = "${elixir}/bin/mix";
rebar = erlangPackages.rebar;
hex = erlangPackages.hex;
bun = pkgs.bun;
bun2nix = inputs.bun2nix.packages.${stdenv.hostPlatform.system}.default;
{
lib,
fetchFromGitHub,
pkgs,
stdenv,
...
}: let
erlang = pkgs.beam.packagesWith pkgs.beam.interpreters.erlang;
mix = "${erlang.elixir}/bin/mix";
translatedPlatform =
{
@ -19,7 +16,9 @@ let
x86_64-darwin = "macos-x64";
x86_64-linux = "linux-x64";
}
.${stdenv.hostPlatform.system};
.${
stdenv.hostPlatform.system
};
version = "v0.6.0";
pname = "mydia";
@ -29,28 +28,39 @@ let
rev = version;
hash = "sha256-JGT52ulnqcx8o+3e0l50TLAwLIWXEI8nwFGUsA95vH0=";
};
mixFodDeps = erlangPackages.fetchMixDeps {
mixFodDeps = erlang.fetchMixDeps {
inherit version src;
pname = "mix-deps-${pname}";
pname = "mix-deps-${pname}-${version}";
hash = "sha256-19q56IZe8YjuUBXirFGgmBsewJ0cmdOoO1yfiMaWGWk=";
DATABASE_TYPE = "postgres";
};
npmFodDeps= pkgs.fetchNpmDeps {
npmFodDeps = pkgs.fetchNpmDeps {
src = "${src}/assets";
hash = "sha256-0cz75pxhxvzo1RogsV8gTP6GrgLIboWQXcKpq42JZ6o=";
};
in
erlangPackages.mixRelease {
erlang.mixRelease {
inherit pname version src mixFodDeps;
enableDebugInfo = true;
nativeBuildInputs = with pkgs; [
# ffmpeg_7
# pkg-config
# tailwindcss
];
buildInputs = with pkgs; [
ffmpeg_7
ffmpeg_6
fdk_aac
sqlite
postgresql
pkg-config
];
buildInputs = with pkgs; [
ffmpeg_6
fdk_aac
sqlite
postgresql
pkg-config
];
DATABASE_TYPE = "postgres";
preInstall = ''
ln -s ${pkgs.tailwindcss}/bin/tailwind _build/tailwind-${translatedPlatform}
@ -87,4 +97,4 @@ erlangPackages.mixRelease {
platforms = lib.platforms.all;
mainProgram = pname;
};
}
}

View file

@ -1,5 +1,10 @@
{ mkShell, inputs, pkgs, stdenv, ... }:
{
mkShell,
inputs,
pkgs,
stdenv,
...
}:
mkShell {
packages = with pkgs; [
bash
@ -7,6 +12,9 @@ mkShell {
just
yq
pwgen
alejandra
nil
nixd
inputs.clan-core.packages.${stdenv.hostPlatform.system}.clan-cli
];
}