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 02c37cc10e8f..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,11 +4,8 @@ buildDotnetModule, fetchFromGitHub, dotnetCorePackages, - autoPatchelfHook, + writeText, copyDesktopItems, - icu, - openssl, - libkrb5, makeDesktopItem, nix-update-script, }: @@ -31,19 +28,22 @@ 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 + dotnetBuildFlags = [ + "-p:CustomAfterDirectoryBuildTargets=${writeText "StubGitVersioning.targets" '' + + + + $(Version) + $(FileVersion) + $(InformationalVersion) + + + + ''}" ]; - buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ - stdenv.cc.cc.lib - icu - openssl - libkrb5 + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + copyDesktopItems ]; dontDotnetFixup = true; @@ -53,6 +53,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 \ @@ -71,6 +72,9 @@ buildDotnetModule (finalAttrs: { icon = "msbuild-structured-log-viewer"; exec = finalAttrs.meta.mainProgram; categories = [ "Development" ]; + mimeTypes = [ + "application/x-binlog" + ]; }; passthru.updateScript = nix-update-script { };