From 1601ed3039e3a29d99e6518fe521455537e18e5c Mon Sep 17 00:00:00 2001 From: js6pak Date: Sun, 27 Apr 2025 20:26:04 +0200 Subject: [PATCH 1/4] msbuild-structured-log-viewer: remove no longer necessary RuntimeIdentifiers flag --- pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix | 3 --- 1 file changed, 3 deletions(-) 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..9b37e702429c 100644 --- a/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix +++ b/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix @@ -31,9 +31,6 @@ buildDotnetModule (finalAttrs: { projectFile = [ "src/StructuredLogViewer.Avalonia/StructuredLogViewer.Avalonia.csproj" ]; nugetDeps = ./deps.json; - # HACK: Clear out RuntimeIdentifiers that's set in StructuredLogViewer.Avalonia.csproj, otherwise our --runtime has no effect - dotnetFlags = [ "-p:RuntimeIdentifiers=" ]; - nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook copyDesktopItems From 40377baef631b426bc786ead5d02ae7bafbf5f6a Mon Sep 17 00:00:00 2001 From: js6pak Date: Sun, 15 Mar 2026 13:55:25 +0100 Subject: [PATCH 2/4] msbuild-structured-log-viewer: remove no longer necessary autoPatchelfHook --- .../ms/msbuild-structured-log-viewer/package.nix | 12 ------------ 1 file changed, 12 deletions(-) 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 9b37e702429c..6d8a48728159 100644 --- a/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix +++ b/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix @@ -4,11 +4,7 @@ buildDotnetModule, fetchFromGitHub, dotnetCorePackages, - autoPatchelfHook, copyDesktopItems, - icu, - openssl, - libkrb5, makeDesktopItem, nix-update-script, }: @@ -32,17 +28,9 @@ buildDotnetModule (finalAttrs: { nugetDeps = ./deps.json; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ - autoPatchelfHook copyDesktopItems ]; - buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ - stdenv.cc.cc.lib - icu - openssl - libkrb5 - ]; - dontDotnetFixup = true; postFixup = '' From 0b2a0da05a5b8060c9a6f2cddea0d53275a27d62 Mon Sep 17 00:00:00 2001 From: js6pak Date: Mon, 10 Nov 2025 21:01:26 +0100 Subject: [PATCH 3/4] msbuild-structured-log-viewer: add a binlog mimetype --- .../by-name/ms/msbuild-structured-log-viewer/mimetype.xml | 8 ++++++++ pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix | 4 ++++ 2 files changed, 12 insertions(+) create mode 100644 pkgs/by-name/ms/msbuild-structured-log-viewer/mimetype.xml diff --git a/pkgs/by-name/ms/msbuild-structured-log-viewer/mimetype.xml b/pkgs/by-name/ms/msbuild-structured-log-viewer/mimetype.xml new file mode 100644 index 000000000000..a8f22189f513 --- /dev/null +++ b/pkgs/by-name/ms/msbuild-structured-log-viewer/mimetype.xml @@ -0,0 +1,8 @@ + + + + MSBuild Structured Log + + + + 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 6d8a48728159..397673875b46 100644 --- a/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix +++ b/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix @@ -38,6 +38,7 @@ buildDotnetModule (finalAttrs: { '' + lib.optionalString stdenv.hostPlatform.isLinux '' install -Dm444 $src/src/StructuredLogViewer/icons/msbuild-structured-log-viewer.png $out/share/icons/hicolor/32x32/apps/msbuild-structured-log-viewer.png + install -Dm444 ${./mimetype.xml} $out/share/mime/packages/binlog.xml '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace src/StructuredLogViewer.Avalonia/Info.plist \ @@ -56,6 +57,9 @@ buildDotnetModule (finalAttrs: { icon = "msbuild-structured-log-viewer"; exec = finalAttrs.meta.mainProgram; categories = [ "Development" ]; + mimeTypes = [ + "application/x-binlog" + ]; }; passthru.updateScript = nix-update-script { }; From 4db9ed4cd173570dddf928de6dd0a3215d72ba6b Mon Sep 17 00:00:00 2001 From: js6pak Date: Sun, 15 Mar 2026 13:56:14 +0100 Subject: [PATCH 4/4] msbuild-structured-log-viewer: stub out git versioning task --- .../ms/msbuild-structured-log-viewer/package.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) 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 397673875b46..1b9766f3d535 100644 --- a/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix +++ b/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix @@ -4,6 +4,7 @@ buildDotnetModule, fetchFromGitHub, dotnetCorePackages, + writeText, copyDesktopItems, makeDesktopItem, nix-update-script, @@ -27,6 +28,20 @@ buildDotnetModule (finalAttrs: { projectFile = [ "src/StructuredLogViewer.Avalonia/StructuredLogViewer.Avalonia.csproj" ]; nugetDeps = ./deps.json; + dotnetBuildFlags = [ + "-p:CustomAfterDirectoryBuildTargets=${writeText "StubGitVersioning.targets" '' + + + + $(Version) + $(FileVersion) + $(InformationalVersion) + + + + ''}" + ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ copyDesktopItems ];