From a6e176c5b2ec099739a23ff9fe3df3e34e2c1a77 Mon Sep 17 00:00:00 2001 From: Sandro Jäckel Date: Fri, 10 Mar 2023 18:05:55 +0100 Subject: ArchiSteamFarm: choose correct framework instead of patching --- pkgs/applications/misc/ArchiSteamFarm/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'pkgs/applications/misc/ArchiSteamFarm/default.nix') diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix index d7909c64a203..da5bda5569f3 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -22,11 +22,6 @@ buildDotnetModule rec { sha256 = "sha256-SRWqe8KTjFdgVW7/EYRVUONtDWwxpcZ1GXWFPjKZzpI="; }; - patches = [ - # otherwise installPhase fails with NETSDK1129 - ./fix-framework.diff - ]; - dotnet-runtime = dotnetCorePackages.aspnetcore_7_0; dotnet-sdk = dotnetCorePackages.sdk_7_0; @@ -38,6 +33,9 @@ buildDotnetModule rec { "-p:PublishSingleFile=true" "-p:PublishTrimmed=true" ]; + dotnetInstallFlags = [ + "--framework=net7.0" + ]; selfContainedBuild = true; runtimeDeps = [ libkrb5 zlib openssl ]; @@ -58,9 +56,11 @@ buildDotnetModule rec { postInstall = '' buildPlugin() { + echo "Publishing plugin $1" dotnet publish $1 -p:ContinuousIntegrationBuild=true -p:Deterministic=true \ --output $out/lib/${pname}/plugins/$1 --configuration Release \ - -p:TargetLatestRuntimePatch=false -p:UseAppHost=false --no-restore + -p:TargetLatestRuntimePatch=false -p:UseAppHost=false --no-restore \ + --framework=net7.0 } buildPlugin ArchiSteamFarm.OfficialPlugins.ItemsMatcher -- cgit 1.4.1