From 2e3ac4cb0ce5771077f23605fb6f569e4b840054 Mon Sep 17 00:00:00 2001 From: twoneis Date: Sat, 15 Mar 2025 12:07:41 +0100 Subject: [PATCH] trying more stuff --- devices/ellaca/options.nix | 1 - modules/fedi/iceshrimp/iceshrimp.nix | 30 +++++++++++++++++++++++----- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/devices/ellaca/options.nix b/devices/ellaca/options.nix index 19bfa97..292a6b2 100644 --- a/devices/ellaca/options.nix +++ b/devices/ellaca/options.nix @@ -37,7 +37,6 @@ in { base = web-domain; }; email = "akkoma@${email-domain}"; - iceshrimp.enable = false; }; matrix = { diff --git a/modules/fedi/iceshrimp/iceshrimp.nix b/modules/fedi/iceshrimp/iceshrimp.nix index 078355a..ef47027 100644 --- a/modules/fedi/iceshrimp/iceshrimp.nix +++ b/modules/fedi/iceshrimp/iceshrimp.nix @@ -1,10 +1,11 @@ { - buildDotnetModule, + stdenv, dotnetCorePackages, + dotnet-sdk_9, }: let version = "v2025.1-beta5.patch2.security1"; in - buildDotnetModule { + stdenv.mkDerivation { pname = "iceshrimp"; version = "2025.1"; @@ -14,10 +15,23 @@ in rev = "aac23cce7b577e6ed58ec9bf1fde4f04c26ff624"; }; - dotnet-sdk = dotnetCorePackages.sdk_9_0; - dotnet-runtime = dotnetCorePackages.runtime_9_0; + nativeBuildInputs = [ + dotnet-sdk_9 + dotnetCorePackages.sdk_9_0 + dotnetCorePackages.runtime_9_0 + ]; + buildInputs = [ + dotnetCorePackages.runtime_9_0 + ]; - projectFile = "Iceshrimp.NET.sln"; + configurePhase = '' + runHook preConfigure + + cd Iceshrimp.Backend + dotnet workload install wasm-tools + + runHook postConfigure + ''; buildPhase = '' runHook preBuild @@ -26,4 +40,10 @@ in runHook postBuild ''; + + installPhase = '' + echo Install Phase + ls + exit 1 + ''; }