nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 16:33:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
David McFarland 2024-09-04 01:18:41 -03:00
parent cc9c59c478
commit e6c700ed11
14 changed files with 37 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/audio/openutau/default.nix
View File

@ -5,9 +5,6 @@
, dotnetCorePackages
, dbus
, fontconfig
, libICE
, libSM
, libX11
, portaudio
}:
@ -32,9 +29,6 @@ buildDotnetModule rec {
runtimeDeps = [
dbus
libICE
libSM
libX11
portaudio
];

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

@ -2,21 +2,16 @@
, 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";
@ -36,8 +31,7 @@ buildDotnetModule rec {
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 ])}"
];

25
pkgs/build-support/dotnet/fetch-nupkg/overrides.nix
View File

@ -3,7 +3,11 @@
dotnetCorePackages,
fontconfig,
lib,
libICE,
libSM,
libX11,
stdenv,
writeText,
}:
{
# e.g.
@ -13,9 +17,25 @@
# 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: {
package.overrideAttrs (
old:
lib.optionalAttrs stdenv.isLinux {
nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ autoPatchelfHook ];
buildInputs = old.buildInputs or [ ] ++ [ fontconfig ];
@ -30,5 +50,6 @@
done
cd - >/dev/null
'';
});
}
);
}

9
pkgs/by-name/be/beatsabermodmanager/package.nix
View File

@ -5,10 +5,6 @@
dotnetCorePackages,
libX11,
libICE,
libSM,
xdg-utils,
}:
@ -37,11 +33,6 @@ buildDotnetModule rec {
nugetDeps = ./deps.nix;
runtimeDeps = [
libX11
libICE
libSM
];
# Required for OneClick
makeWrapperArgs = [

6
pkgs/by-name/bl/blendfarm/package.nix
View File

@ -6,9 +6,6 @@
dotnetCorePackages,
xz,
pcre,
libX11,
libICE,
libSM,
autoPatchelfHook,
bintools,
fixDarwinDylibNames,
@ -77,9 +74,6 @@ buildDotnetModule rec {
runtimeDeps = [
xz
pcre
libX11
libICE
libSM
libgdiplus
glib
libXrandr

3
pkgs/by-name/kn/knossosnet/package.nix
View File

@ -3,7 +3,6 @@
, fetchFromGitHub
, lib
, openal
, xorg
}:
buildDotnetModule rec {
@ -22,7 +21,7 @@ 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
View File

@ -6,13 +6,6 @@
dotnetCorePackages,
wrapGAppsHook3,
libX11,
libICE,
libSM,
libXi,
libXcursor,
libXext,
libXrandr,
glew,
gtk3,
}:
@ -47,13 +40,6 @@ buildDotnetModule rec {
runtimeDeps = [
# For Avalonia UI
libX11
libICE
libSM
libXi
libXcursor
libXext
libXrandr
glew
# For file dialogs
gtk3

6
pkgs/by-name/lu/lumafly/package.nix
View File

@ -6,9 +6,6 @@
zlib,
icu,
openssl,
libX11,
libICE,
libSM,
icoutils,
copyDesktopItems,
makeDesktopItem,
@ -36,9 +33,6 @@ buildDotnetModule rec {
zlib
icu
openssl
libX11
libICE
libSM
];
nativeBuildInputs = [

9
pkgs/by-name/ne/nexusmods-app/package.nix
View File

@ -7,9 +7,6 @@
fetchFromGitHub,
fontconfig,
lib,
libICE,
libSM,
libX11,
runCommand,
pname ? "nexusmods-app",
}:
@ -62,12 +59,6 @@ buildDotnetModule (finalAttrs: {
runtimeInputs = [ desktop-file-utils ];
runtimeDeps = [
libICE
libSM
libX11
];
executables = [ "NexusMods.App" ];
doCheck = true;

11
pkgs/by-name/re/retrospy/package.nix
View File

@ -4,10 +4,6 @@
, copyDesktopItems
, makeDesktopItem
, lib
, libX11
, libXcursor
, libICE
, libSM
, runCommandLocal
}:
let
@ -42,13 +38,6 @@ buildDotnetModule {
copyDesktopItems
];
runtimeDeps = [
libX11
libICE
libXcursor
libSM
];
projectFile = [
"RetroSpyX/RetroSpyX.csproj"
"GBPemuX/GBPemuX.csproj"

12
pkgs/by-name/ry/ryujinx/package.nix
View File

@ -10,12 +10,6 @@
, sndio
, pulseaudio
, vulkan-loader
, libICE
, libSM
, libXi
, libXcursor
, libXext
, libXrandr
, glew
, libGL
, udev
@ -54,12 +48,6 @@ buildDotnetModule rec {
udev
# Avalonia UI
libICE
libSM
libXi
libXcursor
libXext
libXrandr
glew
# Headless executable

14
pkgs/games/space-station-14-launcher/space-station-14-launcher.nix
View File

@ -6,13 +6,6 @@
, iconConvTools
, copyDesktopItems
, makeDesktopItem
, libX11
, libICE
, libSM
, libXi
, libXcursor
, libXext
, libXrandr
, glew
, SDL2
, glfw
@ -94,13 +87,6 @@ buildDotnetModule rec {
gdk-pixbuf
# Avalonia UI dependencies.
libX11
libICE
libSM
libXi
libXcursor
libXext
libXrandr
glew
];

6
pkgs/tools/games/scarab/default.nix
View File

@ -3,9 +3,6 @@
, fetchFromGitHub
, glibc
, zlib
, libX11
, libICE
, libSM
, gtk3
, copyDesktopItems
, icoutils
@ -31,9 +28,6 @@ buildDotnetModule rec {
runtimeDeps = [
glibc
zlib
libX11
libICE
libSM
gtk3
];

4
pkgs/tools/networking/mqttmultimeter/default.nix
View File

@ -4,7 +4,6 @@
, dotnet-runtime_8
, buildDotnetModule
, fetchFromGitHub
, xorg
, libglvnd
, makeDesktopItem
, copyDesktopItems
@ -41,9 +40,6 @@ buildDotnetModule rec {
runtimeDeps = [
libglvnd
xorg.libSM
xorg.libICE
xorg.libX11
];
desktopItems = makeDesktopItem {