dotnetCorePackages.fetchNupkg: override avalonia.x11 to find native libs

Changed files
+37 -120
pkgs
applications
audio
openutau
version-management
git-credential-manager
build-support
dotnet
fetch-nupkg
by-name
be
beatsabermodmanager
bl
blendfarm
kn
knossosnet
li
libation
lu
lumafly
ne
nexusmods-app
re
retrospy
ry
ryujinx
games
space-station-14-launcher
tools
games
scarab
networking
mqttmultimeter
-6
pkgs/applications/audio/openutau/default.nix
···
, dotnetCorePackages
, dbus
, fontconfig
-
, libICE
-
, libSM
-
, libX11
, portaudio
}:
···
runtimeDeps = [
dbus
-
libICE
-
libSM
-
libX11
portaudio
];
+1 -7
pkgs/applications/version-management/git-credential-manager/default.nix
···
, fetchFromGitHub
, buildDotnetModule
, dotnetCorePackages
-
, libX11
-
, libICE
-
, libSM
, libsecret
, git
, git-credential-manager
, gnupg
, pass
, testers
-
, withGuiSupport ? true
, withLibsecretSupport ? true
, withGpgSupport ? true
}:
-
assert withLibsecretSupport -> withGuiSupport;
buildDotnetModule rec {
pname = "git-credential-manager";
version = "2.5.1";
···
executables = [ "git-credential-manager" ];
runtimeDeps =
-
lib.optionals withGuiSupport [ libX11 libICE libSM ]
-
++ lib.optional withLibsecretSupport libsecret;
+
lib.optional withLibsecretSupport libsecret;
makeWrapperArgs = [
"--prefix PATH : ${lib.makeBinPath ([ git ] ++ lib.optionals withGpgSupport [ gnupg pass ])}"
];
+35 -14
pkgs/build-support/dotnet/fetch-nupkg/overrides.nix
···
dotnetCorePackages,
fontconfig,
lib,
+
libICE,
+
libSM,
+
libX11,
stdenv,
+
writeText,
}:
{
# e.g.
···
# buildInputs = old.buildInputs or [ ] ++ [ hello ];
# });
+
"Avalonia.X11" =
+
package:
+
package.overrideAttrs (
+
old:
+
lib.optionalAttrs (!stdenv.isDarwin) {
+
setupHook = writeText "setupHook.sh" ''
+
prependToVar dotnetRuntimeDeps \
+
"${lib.getLib libICE}" \
+
"${lib.getLib libSM}" \
+
"${lib.getLib libX11}"
+
'';
+
}
+
);
+
"SkiaSharp.NativeAssets.Linux" =
package:
-
package.overrideAttrs (old: {
-
nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ autoPatchelfHook ];
+
package.overrideAttrs (
+
old:
+
lib.optionalAttrs stdenv.isLinux {
+
nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ autoPatchelfHook ];
-
buildInputs = old.buildInputs or [ ] ++ [ fontconfig ];
+
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
-
'';
-
});
+
preInstall =
+
old.preInstall or ""
+
+ ''
+
cd runtimes
+
for platform in *; do
+
[[ $platform == "${dotnetCorePackages.systemToDotnetRid stdenv.hostPlatform.system}" ]] ||
+
rm -r "$platform"
+
done
+
cd - >/dev/null
+
'';
+
}
+
);
}
-9
pkgs/by-name/be/beatsabermodmanager/package.nix
···
dotnetCorePackages,
-
libX11,
-
libICE,
-
libSM,
-
xdg-utils,
}:
···
nugetDeps = ./deps.nix;
-
runtimeDeps = [
-
libX11
-
libICE
-
libSM
-
];
# Required for OneClick
makeWrapperArgs = [
-6
pkgs/by-name/bl/blendfarm/package.nix
···
dotnetCorePackages,
xz,
pcre,
-
libX11,
-
libICE,
-
libSM,
autoPatchelfHook,
bintools,
fixDarwinDylibNames,
···
runtimeDeps = [
xz
pcre
-
libX11
-
libICE
-
libSM
libgdiplus
glib
libXrandr
+1 -2
pkgs/by-name/kn/knossosnet/package.nix
···
, fetchFromGitHub
, lib
, openal
-
, xorg
}:
buildDotnetModule rec {
···
nugetDeps = ./deps.nix;
executables = [ "Knossos.NET" ];
-
runtimeDeps = [ openal xorg.libX11 xorg.libICE xorg.libSM ];
+
runtimeDeps = [ openal ];
meta = with lib; {
homepage = "https://github.com/KnossosNET/Knossos.NET";
-14
pkgs/by-name/li/libation/package.nix
···
dotnetCorePackages,
wrapGAppsHook3,
-
libX11,
-
libICE,
-
libSM,
-
libXi,
-
libXcursor,
-
libXext,
-
libXrandr,
glew,
gtk3,
}:
···
runtimeDeps = [
# For Avalonia UI
-
libX11
-
libICE
-
libSM
-
libXi
-
libXcursor
-
libXext
-
libXrandr
glew
# For file dialogs
gtk3
-6
pkgs/by-name/lu/lumafly/package.nix
···
zlib,
icu,
openssl,
-
libX11,
-
libICE,
-
libSM,
icoutils,
copyDesktopItems,
makeDesktopItem,
···
zlib
icu
openssl
-
libX11
-
libICE
-
libSM
];
nativeBuildInputs = [
-9
pkgs/by-name/ne/nexusmods-app/package.nix
···
fetchFromGitHub,
fontconfig,
lib,
-
libICE,
-
libSM,
-
libX11,
runCommand,
pname ? "nexusmods-app",
}:
···
];
runtimeInputs = [ desktop-file-utils ];
-
-
runtimeDeps = [
-
libICE
-
libSM
-
libX11
-
];
executables = [ "NexusMods.App" ];
-11
pkgs/by-name/re/retrospy/package.nix
···
, copyDesktopItems
, makeDesktopItem
, lib
-
, libX11
-
, libXcursor
-
, libICE
-
, libSM
, runCommandLocal
}:
let
···
nativeBuildInputs = [
copyDesktopItems
-
];
-
-
runtimeDeps = [
-
libX11
-
libICE
-
libXcursor
-
libSM
];
projectFile = [
-12
pkgs/by-name/ry/ryujinx/package.nix
···
, sndio
, pulseaudio
, vulkan-loader
-
, libICE
-
, libSM
-
, libXi
-
, libXcursor
-
, libXext
-
, libXrandr
, glew
, libGL
, udev
···
udev
# Avalonia UI
-
libICE
-
libSM
-
libXi
-
libXcursor
-
libXext
-
libXrandr
glew
# Headless executable
-14
pkgs/games/space-station-14-launcher/space-station-14-launcher.nix
···
, iconConvTools
, copyDesktopItems
, makeDesktopItem
-
, libX11
-
, libICE
-
, libSM
-
, libXi
-
, libXcursor
-
, libXext
-
, libXrandr
, glew
, SDL2
, glfw
···
gdk-pixbuf
# Avalonia UI dependencies.
-
libX11
-
libICE
-
libSM
-
libXi
-
libXcursor
-
libXext
-
libXrandr
glew
];
-6
pkgs/tools/games/scarab/default.nix
···
, fetchFromGitHub
, glibc
, zlib
-
, libX11
-
, libICE
-
, libSM
, gtk3
, copyDesktopItems
, icoutils
···
runtimeDeps = [
glibc
zlib
-
libX11
-
libICE
-
libSM
gtk3
];
-4
pkgs/tools/networking/mqttmultimeter/default.nix
···
, dotnet-runtime_8
, buildDotnetModule
, fetchFromGitHub
-
, xorg
, libglvnd
, makeDesktopItem
, copyDesktopItems
···
runtimeDeps = [
libglvnd
-
xorg.libSM
-
xorg.libICE
-
xorg.libX11
];
desktopItems = makeDesktopItem {