diff --git a/pkgs/applications/audio/openutau/default.nix b/pkgs/applications/audio/openutau/default.nix index 3e16c7b512de..bb5c43f29fb7 100644 --- a/pkgs/applications/audio/openutau/default.nix +++ b/pkgs/applications/audio/openutau/default.nix @@ -32,7 +32,6 @@ buildDotnetModule rec { runtimeDeps = [ dbus - fontconfig libICE libSM libX11 diff --git a/pkgs/applications/version-management/git-credential-manager/default.nix b/pkgs/applications/version-management/git-credential-manager/default.nix index 592074224f01..fb70c4b71888 100644 --- a/pkgs/applications/version-management/git-credential-manager/default.nix +++ b/pkgs/applications/version-management/git-credential-manager/default.nix @@ -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 ])}" diff --git a/pkgs/build-support/dotnet/fetch-nupkg/overrides.nix b/pkgs/build-support/dotnet/fetch-nupkg/overrides.nix index f00e41fb1fad..384505a65cd2 100644 --- a/pkgs/build-support/dotnet/fetch-nupkg/overrides.nix +++ b/pkgs/build-support/dotnet/fetch-nupkg/overrides.nix @@ -1,4 +1,10 @@ -{ 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 + ''; + }); } diff --git a/pkgs/by-name/be/beatsabermodmanager/package.nix b/pkgs/by-name/be/beatsabermodmanager/package.nix index 96705c35d345..a44d30f7fa70 100644 --- a/pkgs/by-name/be/beatsabermodmanager/package.nix +++ b/pkgs/by-name/be/beatsabermodmanager/package.nix @@ -8,7 +8,6 @@ libX11, libICE, libSM, - fontconfig, xdg-utils, }: @@ -42,7 +41,6 @@ buildDotnetModule rec { libX11 libICE libSM - fontconfig ]; # Required for OneClick diff --git a/pkgs/by-name/bl/blendfarm/package.nix b/pkgs/by-name/bl/blendfarm/package.nix index badbda23c38a..ba7bfc21af3c 100644 --- a/pkgs/by-name/bl/blendfarm/package.nix +++ b/pkgs/by-name/bl/blendfarm/package.nix @@ -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 diff --git a/pkgs/by-name/kn/knossosnet/package.nix b/pkgs/by-name/kn/knossosnet/package.nix index a6a41e20fc73..ab767a89300d 100644 --- a/pkgs/by-name/kn/knossosnet/package.nix +++ b/pkgs/by-name/kn/knossosnet/package.nix @@ -1,7 +1,6 @@ { buildDotnetModule , fetchFromGitHub - , fontconfig , lib , openal , xorg @@ -23,7 +22,7 @@ buildDotnetModule rec { nugetDeps = ./deps.nix; executables = [ "Knossos.NET" ]; - runtimeDeps = [ fontconfig openal xorg.libX11 xorg.libICE xorg.libSM ]; + runtimeDeps = [ openal xorg.libX11 xorg.libICE xorg.libSM ]; meta = with lib; { homepage = "https://github.com/KnossosNET/Knossos.NET"; diff --git a/pkgs/by-name/li/libation/package.nix b/pkgs/by-name/li/libation/package.nix index fc61d7c0d48f..ff736584a33d 100644 --- a/pkgs/by-name/li/libation/package.nix +++ b/pkgs/by-name/li/libation/package.nix @@ -13,7 +13,6 @@ libXcursor, libXext, libXrandr, - fontconfig, glew, gtk3, }: @@ -55,7 +54,6 @@ buildDotnetModule rec { libXcursor libXext libXrandr - fontconfig glew # For file dialogs gtk3 diff --git a/pkgs/by-name/lu/lumafly/package.nix b/pkgs/by-name/lu/lumafly/package.nix index 14227990c490..676b00cfa646 100644 --- a/pkgs/by-name/lu/lumafly/package.nix +++ b/pkgs/by-name/lu/lumafly/package.nix @@ -5,7 +5,6 @@ dotnetCorePackages, zlib, icu, - fontconfig, openssl, libX11, libICE, @@ -36,7 +35,6 @@ buildDotnetModule rec { runtimeDeps = [ zlib icu - fontconfig openssl libX11 libICE diff --git a/pkgs/by-name/ne/nexusmods-app/package.nix b/pkgs/by-name/ne/nexusmods-app/package.nix index 68f5dadc393a..a55bb43e0007 100644 --- a/pkgs/by-name/ne/nexusmods-app/package.nix +++ b/pkgs/by-name/ne/nexusmods-app/package.nix @@ -63,7 +63,6 @@ buildDotnetModule (finalAttrs: { runtimeInputs = [ desktop-file-utils ]; runtimeDeps = [ - fontconfig libICE libSM libX11 diff --git a/pkgs/by-name/re/retrospy/package.nix b/pkgs/by-name/re/retrospy/package.nix index a68b08617f43..869b6debfb1a 100644 --- a/pkgs/by-name/re/retrospy/package.nix +++ b/pkgs/by-name/re/retrospy/package.nix @@ -4,7 +4,6 @@ , copyDesktopItems , makeDesktopItem , lib -, fontconfig , libX11 , libXcursor , libICE @@ -44,7 +43,6 @@ buildDotnetModule { ]; runtimeDeps = [ - fontconfig libX11 libICE libXcursor diff --git a/pkgs/by-name/ry/ryujinx/package.nix b/pkgs/by-name/ry/ryujinx/package.nix index 590b7cfc7cce..cbf8e5281008 100644 --- a/pkgs/by-name/ry/ryujinx/package.nix +++ b/pkgs/by-name/ry/ryujinx/package.nix @@ -16,7 +16,6 @@ , libXcursor , libXext , libXrandr -, fontconfig , glew , libGL , udev @@ -61,7 +60,6 @@ buildDotnetModule rec { libXcursor libXext libXrandr - fontconfig glew # Headless executable diff --git a/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix b/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix index cde4cee0384a..909b57277f61 100644 --- a/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix +++ b/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix @@ -13,7 +13,6 @@ , libXcursor , libXext , libXrandr -, fontconfig , glew , SDL2 , glfw @@ -102,7 +101,6 @@ buildDotnetModule rec { libXcursor libXext libXrandr - fontconfig glew ]; diff --git a/pkgs/tools/games/scarab/default.nix b/pkgs/tools/games/scarab/default.nix index 11ec9e7cdd02..e3bce4d7e574 100644 --- a/pkgs/tools/games/scarab/default.nix +++ b/pkgs/tools/games/scarab/default.nix @@ -6,7 +6,6 @@ , libX11 , libICE , libSM -, fontconfig , gtk3 , copyDesktopItems , icoutils @@ -35,7 +34,6 @@ buildDotnetModule rec { libX11 libICE libSM - fontconfig gtk3 ]; diff --git a/pkgs/tools/networking/mqttmultimeter/default.nix b/pkgs/tools/networking/mqttmultimeter/default.nix index 1c2c290bef78..a265f1dfa472 100644 --- a/pkgs/tools/networking/mqttmultimeter/default.nix +++ b/pkgs/tools/networking/mqttmultimeter/default.nix @@ -4,7 +4,6 @@ , dotnet-runtime_8 , buildDotnetModule , fetchFromGitHub -, fontconfig , xorg , libglvnd , makeDesktopItem @@ -34,7 +33,7 @@ buildDotnetModule rec { copyDesktopItems ]; - buildInputs = [ stdenv.cc.cc.lib fontconfig ]; + buildInputs = [ stdenv.cc.cc.lib ]; postInstall = '' rm -rf $out/lib/${lib.toLower pname}/runtimes/{*musl*,win*}