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 diff --git a/pkgs/applications/misc/ArchiSteamFarm/fix-framework.diff b/pkgs/applications/misc/ArchiSteamFarm/fix-framework.diff deleted file mode 100644 index 6c525e735b0e..000000000000 --- a/pkgs/applications/misc/ArchiSteamFarm/fix-framework.diff +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/Directory.Build.props b/Directory.Build.props -index 89137fba..bce300a4 100644 ---- a/Directory.Build.props -+++ b/Directory.Build.props -@@ -29,16 +29,16 @@ - $(PackageProjectUrl).git - LatestMajor - linux-arm;linux-arm64;linux-x64;osx-arm64;osx-x64;win-arm64;win-x64 -- net7.0 -+ net7.0 - true - - - -- $(TargetFrameworks);net481 -+ $(TargetFramework);net481 - - - -- $(TargetFrameworks);netstandard2.1 -+ $(TargetFramework);netstandard2.1 - - -