Unverified Commit a6e176c5 authored by Sandro Jäckel's avatar Sandro Jäckel
Browse files

ArchiSteamFarm: choose correct framework instead of patching

parent c1222f07

pkgs/applications/misc/ArchiSteamFarm/default.nix

+6 −6
Original line number Diff line number Diff line
@@ -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

pkgs/applications/misc/ArchiSteamFarm/fix-framework.diff

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
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'">