Commit 9a0be2fd authored by David McFarland's avatar David McFarland
Browse files

dotnetCorePackages.fetchNupkg: override skiasharp to find fontconfig

parent 1f6cd35f

pkgs/applications/audio/openutau/default.nix

+0 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ buildDotnetModule rec { 


  runtimeDeps = [

    dbus

    fontconfig

    libICE

    libSM

    libX11

pkgs/applications/version-management/git-credential-manager/default.nix

+2 −3
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
, libX11

, libICE

, libSM

, fontconfig

, libsecret

, git

, git-credential-manager
@@ -36,8 +35,8 @@ buildDotnetModule rec { 
  dotnetInstallFlags = [ "--framework" "net8.0" ];

  executables = [ "git-credential-manager" ];



  runtimeDeps = [ fontconfig ]

    ++ lib.optionals withGuiSupport [ libX11 libICE libSM ]

  runtimeDeps =

    lib.optionals withGuiSupport [ libX11 libICE libSM ]

    ++ lib.optional withLibsecretSupport libsecret;

  makeWrapperArgs = [

    "--prefix PATH : ${lib.makeBinPath ([ git ] ++ lib.optionals withGpgSupport [ gnupg pass ])}"

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

+26 −1
Original line number Diff line number Diff line 
{ autoPatchelfHook }:

{

  autoPatchelfHook,

  dotnetCorePackages,

  fontconfig,

  lib,

  stdenv,

}:

{

  # e.g.

  # "Package.Id" =
@@ -6,4 +12,23 @@ 
  #   package.overrideAttrs (old: {

  #     buildInputs = old.buildInputs or [ ] ++ [ hello ];

  #   });



  "SkiaSharp.NativeAssets.Linux" =

    package:

    package.overrideAttrs (old: {

      nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ autoPatchelfHook ];



      buildInputs = old.buildInputs or [ ] ++ [ fontconfig ];



      preInstall =

        old.preInstall or ""

        + ''

          cd runtimes

          for platform in *; do

            [[ $platform == "${dotnetCorePackages.systemToDotnetRid stdenv.hostPlatform.system}" ]] ||

              rm -r "$platform"

          done

          cd - >/dev/null

        '';

    });

}

pkgs/by-name/be/beatsabermodmanager/package.nix

+0 −2
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ 
  libX11,

  libICE,

  libSM,

  fontconfig,



  xdg-utils,

}:
@@ -42,7 +41,6 @@ buildDotnetModule rec { 
    libX11

    libICE

    libSM

    fontconfig

  ];



  # Required for OneClick

pkgs/by-name/bl/blendfarm/package.nix

+0 −1
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ buildDotnetModule rec { 
    libgdiplus

    glib

    libXrandr

    fontconfig

  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ blender ];



  # there is no "*.so.3" or "*.so.5" in nixpkgs. So ignore the warning