MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

treewide: remove autoPatchelfHook from dotnet packages

Browse source
This commit is contained in:
David McFarland 2024-04-17 16:11:47 -03:00
parent bd934093f4
commit 57d6e5bda6
7 changed files with 2 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/applications/audio/galaxy-buds-client/default.nix
View file

@ -2,7 +2,6 @@
, stdenv
, buildDotnetModule
, fetchFromGitHub
, autoPatchelfHook
, fontconfig
, xorg
, libglvnd
@ -27,7 +26,6 @@ buildDotnetModule rec {
dotnetFlags = [ "-p:Runtimeidentifier=linux-x64" ];
nativeBuildInputs = [
autoPatchelfHook
copyDesktopItems
graphicsmagick
];

2
pkgs/applications/blockchains/wasabibackend/default.nix
View file

@ -4,7 +4,6 @@
fetchFromGitHub,
buildDotnetModule,
dotnetCorePackages,
autoPatchelfHook,
zlib,
openssl,
}:
@ -25,7 +24,6 @@ buildDotnetModule rec {
dotnet-sdk = dotnetCorePackages.sdk_7_0;
dotnet-runtime = dotnetCorePackages.aspnetcore_7_0;
nativeBuildInputs = [autoPatchelfHook];
buildInputs = [stdenv.cc.cc.lib zlib];
runtimeDeps = [openssl zlib];

4
pkgs/applications/misc/avalonia-ilspy/default.nix
View file

@ -15,7 +15,6 @@
, makeDesktopItem
, copyDesktopItems
, icoutils
, autoPatchelfHook
, bintools
, fixDarwinDylibNames
, autoSignDarwinBinariesHook
@ -40,8 +39,7 @@ buildDotnetModule rec {
nativeBuildInputs = [
copyDesktopItems
icoutils
] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ bintools fixDarwinDylibNames ]
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ bintools fixDarwinDylibNames ]
++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ autoSignDarwinBinariesHook ];
buildInputs = [

2
pkgs/development/compilers/inklecate/default.nix
View file

@ -1,6 +1,5 @@
{ lib
, stdenv
, autoPatchelfHook
, buildDotnetModule
, dotnetCorePackages
, fetchFromGitHub
@ -17,7 +16,6 @@ buildDotnetModule rec {
hash = "sha512-aUjjT5Qf64wrKRn1vkwJadMOBWMkvsXUjtZ7S3/ZWAh1CCDkQNO84mSbtbVc9ny0fKeJEqaDX2tJNwq7pYqAbA==";
};
nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ];
buildInputs = [ stdenv.cc.cc.lib ];
projectFile = "inklecate/inklecate.csproj";

5
pkgs/development/tools/continuous-integration/github-runner/default.nix
View file

@ -1,5 +1,4 @@
{ autoPatchelfHook
, autoSignDarwinBinariesHook
{ autoSignDarwinBinariesHook
, buildDotnetModule
, dotnetCorePackages
, fetchFromGitHub
@ -114,8 +113,6 @@ buildDotnetModule rec {
nativeBuildInputs = [
which
git
] ++ lib.optionals stdenv.isLinux [
autoPatchelfHook
] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
autoSignDarwinBinariesHook
];

8
pkgs/tools/games/opentracker/default.nix
View file

@ -3,7 +3,6 @@
stdenv,
buildDotnetModule,
fetchFromGitHub,
autoPatchelfHook,
wrapGAppsHook,
dotnetCorePackages,
fontconfig,
@ -40,7 +39,6 @@ buildDotnetModule rec {
];
nativeBuildInputs = [
autoPatchelfHook
wrapGAppsHook
];
@ -64,12 +62,6 @@ buildDotnetModule rec {
libXi
]);
# Attempts to patchelf unneeded SOs
autoPatchelfIgnoreMissingDeps = [
"libc.musl-x86_64.so.1"
"libintl.so.8"
];
meta = with lib; {
description = "A tracking application for A Link to the Past Randomizer";
homepage = "https://github.com/trippsc2/OpenTracker";

6
pkgs/tools/networking/mqttmultimeter/default.nix
View file

@ -4,7 +4,6 @@
, dotnet-runtime_8
, buildDotnetModule
, fetchFromGitHub
, autoPatchelfHook
, fontconfig
, xorg
, libglvnd
@ -12,9 +11,6 @@
, copyDesktopItems
}:
# NOTES:
# 1. we need autoPatchelfHook for quite a number of things in $out/lib
buildDotnetModule rec {
pname = "mqttmultimeter";
version = "1.8.2.272";
@ -35,13 +31,11 @@ buildDotnetModule rec {
executables = [ "mqttMultimeter" ];
nativeBuildInputs = [
autoPatchelfHook
copyDesktopItems
];
buildInputs = [ stdenv.cc.cc.lib fontconfig ];
# don't care about musl and windows versions, as they fail autoPatchelfHook
postInstall = ''
rm -rf $out/lib/${lib.toLower pname}/runtimes/{*musl*,win*}
'';