Unverified Commit c8a0f014 authored by Matt Sturgeon's avatar Matt Sturgeon
Browse files

dotnetCorePackages.fetchNupkg: override avalonia to include upstream fix 

Backport https://github.com/AvaloniaUI/Avalonia/pull/16835

 to versions
11.1.0 through 11.2.0-beta1

Co-authored-by: default avatarNick Cao <nickcao@nichi.co>
parent c8e710a3

pkgs/build-support/dotnet/fetch-nupkg/overrides.nix

+32 −0
Original line number Diff line number Diff line
@@ -17,6 +17,38 @@ 
  #     buildInputs = old.buildInputs or [ ] ++ [ hello ];

  #   });



  "Avalonia" =

    package:

    package.overrideAttrs (

      old:

      let

        # These versions have a runtime error when built with `dotnet publish --no-build`

        # When attempting to draw a window, Avalonia will throw "No precompiled XAML found"

        #

        # Introduced in https://github.com/AvaloniaUI/Avalonia/pull/13840

        # Fixed by https://github.com/AvaloniaUI/Avalonia/pull/16835

        affectedVersions = [

          "11.1.0-beta1"

          "11.1.0-beta2"

          "11.1.0-rc1"

          "11.1.0-rc2"

          "11.1.0"

          "11.1.1"

          "11.1.2-rc1"

          "11.1.2"

          "11.1.3"

          "11.2.0-beta1"

        ];

      in

      lib.optionalAttrs (builtins.elem old.version affectedVersions) {

        postPatch = ''

          substituteInPlace {build,buildTransitive}/AvaloniaBuildTasks.targets \

            --replace-fail 'BeforeTargets="CopyFilesToOutputDirectory;BuiltProjectOutputGroup"' \

                           'BeforeTargets="CopyFilesToOutputDirectory;BuiltProjectOutputGroup;ComputeResolvedFilesToPublishList"'

        '';

      }

    );



  "Avalonia.X11" =

    package:

    package.overrideAttrs (