diff options
| author | Sandro Jäckel <sandro.jaeckel@sap.com> | 2023-03-10 18:05:55 +0100 |
|---|---|---|
| committer | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2023-03-10 20:26:29 +0100 |
| commit | a6e176c5b2ec099739a23ff9fe3df3e34e2c1a77 (patch) | |
| tree | b0332b8225ea16e9489b882d9be5c79d926119e6 /pkgs/applications/misc/ArchiSteamFarm | |
| parent | c1222f071a8f3be66de3f18de9408ff04231ccc8 (diff) | |
ArchiSteamFarm: choose correct framework instead of patching
Diffstat (limited to 'pkgs/applications/misc/ArchiSteamFarm')
| -rw-r--r-- | pkgs/applications/misc/ArchiSteamFarm/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/applications/misc/ArchiSteamFarm/fix-framework.diff | 24 |
2 files changed, 6 insertions, 30 deletions
diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix index d7909c64a203d..da5bda5569f32 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 6c525e735b0ec..0000000000000 --- 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 @@ - <RepositoryUrl>$(PackageProjectUrl).git</RepositoryUrl> - <RollForward>LatestMajor</RollForward> - <RuntimeIdentifiers>linux-arm;linux-arm64;linux-x64;osx-arm64;osx-x64;win-arm64;win-x64</RuntimeIdentifiers> -- <TargetFrameworks>net7.0</TargetFrameworks> -+ <TargetFramework>net7.0</TargetFramework> - <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch> - </PropertyGroup> - - <PropertyGroup Condition="'$(OS)' == 'Windows_NT' OR '$(ASFNetFramework)' != ''"> -- <TargetFrameworks>$(TargetFrameworks);net481</TargetFrameworks> -+ <TargetFramework>$(TargetFramework);net481</TargetFramework> - </PropertyGroup> - - <PropertyGroup Condition="'$(ASFNetStandard)' != ''"> -- <TargetFrameworks>$(TargetFrameworks);netstandard2.1</TargetFrameworks> -+ <TargetFramework>$(TargetFramework);netstandard2.1</TargetFramework> - </PropertyGroup> - - <ItemGroup Condition="'$(TargetFramework)' == 'net481' OR '$(TargetFramework)' == 'netstandard2.1'"> |