From f272d819c1363badcfe210ca8d293b63f50ae72d Mon Sep 17 00:00:00 2001 From: js6pak Date: Mon, 16 Mar 2026 18:54:29 +0100 Subject: [PATCH] dotnetCorePackages.fetchNupkg: neutralize avalonia.buildservices --- pkgs/build-support/dotnet/fetch-nupkg/overrides.nix | 9 +++++++++ pkgs/by-name/kn/knossosnet/package.nix | 4 ---- pkgs/by-name/li/libation/package.nix | 2 -- .../by-name/ms/msbuild-structured-log-viewer/package.nix | 2 -- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/build-support/dotnet/fetch-nupkg/overrides.nix b/pkgs/build-support/dotnet/fetch-nupkg/overrides.nix index 89f8308802cc..3f02ee5c603e 100644 --- a/pkgs/build-support/dotnet/fetch-nupkg/overrides.nix +++ b/pkgs/build-support/dotnet/fetch-nupkg/overrides.nix @@ -63,6 +63,15 @@ } ); + "Avalonia.BuildServices" = + package: + package.overrideAttrs (old: { + postPatch = '' + shopt -s extglob + rm -rf !(*.nuspec) + ''; + }); + "SkiaSharp.NativeAssets.Linux" = package: package.overrideAttrs ( diff --git a/pkgs/by-name/kn/knossosnet/package.nix b/pkgs/by-name/kn/knossosnet/package.nix index 24f4255bb985..3f081e4e5249 100644 --- a/pkgs/by-name/kn/knossosnet/package.nix +++ b/pkgs/by-name/kn/knossosnet/package.nix @@ -31,10 +31,6 @@ buildDotnetModule rec { runtimeDeps = [ openal ]; - env = { - AVALONIA_TELEMETRY_OPTOUT = "1"; - }; - nativeBuildInputs = [ copyDesktopItems ]; desktopItems = [ diff --git a/pkgs/by-name/li/libation/package.nix b/pkgs/by-name/li/libation/package.nix index 40094fee9f77..03a9bafe2ff5 100644 --- a/pkgs/by-name/li/libation/package.nix +++ b/pkgs/by-name/li/libation/package.nix @@ -27,8 +27,6 @@ buildDotnetModule rec { sourceRoot = "${src.name}/Source"; - env.AVALONIA_TELEMETRY_OPTOUT = "1"; - dotnet-sdk = dotnetCorePackages.sdk_10_0_1xx; dotnet-runtime = dotnetCorePackages.runtime_10_0; diff --git a/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix b/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix index 02c37cc10e8f..b3c1ab00f75c 100644 --- a/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix +++ b/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix @@ -23,8 +23,6 @@ buildDotnetModule (finalAttrs: { hash = "sha256-HTWPsVl/pMi+lMSax5JNtbPXHeqD8QxfvLp2bhVxfPs="; }; - env.AVALONIA_TELEMETRY_OPTOUT = "1"; - dotnet-sdk = dotnetCorePackages.sdk_8_0; dotnet-runtime = dotnetCorePackages.runtime_8_0;