From 7f4c6202f0d180e9d126fd8ce4b58b2c801651b2 Mon Sep 17 00:00:00 2001 From: twoneis Date: Sat, 15 Mar 2025 00:49:36 +0100 Subject: [PATCH] dependency issues again --- modules/fedi/iceshrimp/iceshrimp.nix | 36 +++++++++++++--------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/modules/fedi/iceshrimp/iceshrimp.nix b/modules/fedi/iceshrimp/iceshrimp.nix index 9606cf5..078355a 100644 --- a/modules/fedi/iceshrimp/iceshrimp.nix +++ b/modules/fedi/iceshrimp/iceshrimp.nix @@ -1,31 +1,29 @@ { - stdenv, - fetchurl, - zstd, - gnutar, + buildDotnetModule, + dotnetCorePackages, }: let version = "v2025.1-beta5.patch2.security1"; in - stdenv.mkDerivation { - name = "iceshrimp"; - src = fetchurl { - url = "https://iceshrimp.dev/iceshrimp/Iceshrimp.NET/releases/download/v2025.1-beta5.patch2.security1/Iceshrimp.NET-${version}-linux-amd64-glibc.tar.zst"; - hash = "sha256-Uwstie81M3kM9CjukIG+wXpxp91uTuXFMB/fZlFWsMk="; + buildDotnetModule { + pname = "iceshrimp"; + version = "2025.1"; + + src = builtins.fetchGit { + url = "https://iceshrimp.dev/iceshrimp/Iceshrimp.NET/"; + ref = version; + rev = "aac23cce7b577e6ed58ec9bf1fde4f04c26ff624"; }; - nativeBuildInputs = [ - zstd - gnutar - ]; + dotnet-sdk = dotnetCorePackages.sdk_9_0; + dotnet-runtime = dotnetCorePackages.runtime_9_0; - unpackPhase = '' - runHook preUnpack + projectFile = "Iceshrimp.NET.sln"; - mkdir -p $out + buildPhase = '' + runHook preBuild - tar xf $src - cp -r * $out + make publish - runHook postUnpack + runHook postBuild ''; }