mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 14:54:29 +01:00
treewide: remove autoPatchelfHook from dotnet packages
This commit is contained in:
parent
bd934093f4
commit
57d6e5bda6
7 changed files with 2 additions and 27 deletions
|
@ -2,7 +2,6 @@
|
||||||
, stdenv
|
, stdenv
|
||||||
, buildDotnetModule
|
, buildDotnetModule
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, autoPatchelfHook
|
|
||||||
, fontconfig
|
, fontconfig
|
||||||
, xorg
|
, xorg
|
||||||
, libglvnd
|
, libglvnd
|
||||||
|
@ -27,7 +26,6 @@ buildDotnetModule rec {
|
||||||
dotnetFlags = [ "-p:Runtimeidentifier=linux-x64" ];
|
dotnetFlags = [ "-p:Runtimeidentifier=linux-x64" ];
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
autoPatchelfHook
|
|
||||||
copyDesktopItems
|
copyDesktopItems
|
||||||
graphicsmagick
|
graphicsmagick
|
||||||
];
|
];
|
||||||
|
|
|
@ -4,7 +4,6 @@
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
buildDotnetModule,
|
buildDotnetModule,
|
||||||
dotnetCorePackages,
|
dotnetCorePackages,
|
||||||
autoPatchelfHook,
|
|
||||||
zlib,
|
zlib,
|
||||||
openssl,
|
openssl,
|
||||||
}:
|
}:
|
||||||
|
@ -25,7 +24,6 @@ buildDotnetModule rec {
|
||||||
dotnet-sdk = dotnetCorePackages.sdk_7_0;
|
dotnet-sdk = dotnetCorePackages.sdk_7_0;
|
||||||
dotnet-runtime = dotnetCorePackages.aspnetcore_7_0;
|
dotnet-runtime = dotnetCorePackages.aspnetcore_7_0;
|
||||||
|
|
||||||
nativeBuildInputs = [autoPatchelfHook];
|
|
||||||
buildInputs = [stdenv.cc.cc.lib zlib];
|
buildInputs = [stdenv.cc.cc.lib zlib];
|
||||||
|
|
||||||
runtimeDeps = [openssl zlib];
|
runtimeDeps = [openssl zlib];
|
||||||
|
|
|
@ -15,7 +15,6 @@
|
||||||
, makeDesktopItem
|
, makeDesktopItem
|
||||||
, copyDesktopItems
|
, copyDesktopItems
|
||||||
, icoutils
|
, icoutils
|
||||||
, autoPatchelfHook
|
|
||||||
, bintools
|
, bintools
|
||||||
, fixDarwinDylibNames
|
, fixDarwinDylibNames
|
||||||
, autoSignDarwinBinariesHook
|
, autoSignDarwinBinariesHook
|
||||||
|
@ -40,8 +39,7 @@ buildDotnetModule rec {
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
copyDesktopItems
|
copyDesktopItems
|
||||||
icoutils
|
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 ];
|
++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ autoSignDarwinBinariesHook ];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
{ lib
|
{ lib
|
||||||
, stdenv
|
, stdenv
|
||||||
, autoPatchelfHook
|
|
||||||
, buildDotnetModule
|
, buildDotnetModule
|
||||||
, dotnetCorePackages
|
, dotnetCorePackages
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
|
@ -17,7 +16,6 @@ buildDotnetModule rec {
|
||||||
hash = "sha512-aUjjT5Qf64wrKRn1vkwJadMOBWMkvsXUjtZ7S3/ZWAh1CCDkQNO84mSbtbVc9ny0fKeJEqaDX2tJNwq7pYqAbA==";
|
hash = "sha512-aUjjT5Qf64wrKRn1vkwJadMOBWMkvsXUjtZ7S3/ZWAh1CCDkQNO84mSbtbVc9ny0fKeJEqaDX2tJNwq7pYqAbA==";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ];
|
|
||||||
buildInputs = [ stdenv.cc.cc.lib ];
|
buildInputs = [ stdenv.cc.cc.lib ];
|
||||||
|
|
||||||
projectFile = "inklecate/inklecate.csproj";
|
projectFile = "inklecate/inklecate.csproj";
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
{ autoPatchelfHook
|
{ autoSignDarwinBinariesHook
|
||||||
, autoSignDarwinBinariesHook
|
|
||||||
, buildDotnetModule
|
, buildDotnetModule
|
||||||
, dotnetCorePackages
|
, dotnetCorePackages
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
|
@ -114,8 +113,6 @@ buildDotnetModule rec {
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
which
|
which
|
||||||
git
|
git
|
||||||
] ++ lib.optionals stdenv.isLinux [
|
|
||||||
autoPatchelfHook
|
|
||||||
] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
|
] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
|
||||||
autoSignDarwinBinariesHook
|
autoSignDarwinBinariesHook
|
||||||
];
|
];
|
||||||
|
|
|
@ -3,7 +3,6 @@
|
||||||
stdenv,
|
stdenv,
|
||||||
buildDotnetModule,
|
buildDotnetModule,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
autoPatchelfHook,
|
|
||||||
wrapGAppsHook,
|
wrapGAppsHook,
|
||||||
dotnetCorePackages,
|
dotnetCorePackages,
|
||||||
fontconfig,
|
fontconfig,
|
||||||
|
@ -40,7 +39,6 @@ buildDotnetModule rec {
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
autoPatchelfHook
|
|
||||||
wrapGAppsHook
|
wrapGAppsHook
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -64,12 +62,6 @@ buildDotnetModule rec {
|
||||||
libXi
|
libXi
|
||||||
]);
|
]);
|
||||||
|
|
||||||
# Attempts to patchelf unneeded SOs
|
|
||||||
autoPatchelfIgnoreMissingDeps = [
|
|
||||||
"libc.musl-x86_64.so.1"
|
|
||||||
"libintl.so.8"
|
|
||||||
];
|
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "A tracking application for A Link to the Past Randomizer";
|
description = "A tracking application for A Link to the Past Randomizer";
|
||||||
homepage = "https://github.com/trippsc2/OpenTracker";
|
homepage = "https://github.com/trippsc2/OpenTracker";
|
||||||
|
|
|
@ -4,7 +4,6 @@
|
||||||
, dotnet-runtime_8
|
, dotnet-runtime_8
|
||||||
, buildDotnetModule
|
, buildDotnetModule
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, autoPatchelfHook
|
|
||||||
, fontconfig
|
, fontconfig
|
||||||
, xorg
|
, xorg
|
||||||
, libglvnd
|
, libglvnd
|
||||||
|
@ -12,9 +11,6 @@
|
||||||
, copyDesktopItems
|
, copyDesktopItems
|
||||||
}:
|
}:
|
||||||
|
|
||||||
# NOTES:
|
|
||||||
# 1. we need autoPatchelfHook for quite a number of things in $out/lib
|
|
||||||
|
|
||||||
buildDotnetModule rec {
|
buildDotnetModule rec {
|
||||||
pname = "mqttmultimeter";
|
pname = "mqttmultimeter";
|
||||||
version = "1.8.2.272";
|
version = "1.8.2.272";
|
||||||
|
@ -35,13 +31,11 @@ buildDotnetModule rec {
|
||||||
executables = [ "mqttMultimeter" ];
|
executables = [ "mqttMultimeter" ];
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
autoPatchelfHook
|
|
||||||
copyDesktopItems
|
copyDesktopItems
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [ stdenv.cc.cc.lib fontconfig ];
|
buildInputs = [ stdenv.cc.cc.lib fontconfig ];
|
||||||
|
|
||||||
# don't care about musl and windows versions, as they fail autoPatchelfHook
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
rm -rf $out/lib/${lib.toLower pname}/runtimes/{*musl*,win*}
|
rm -rf $out/lib/${lib.toLower pname}/runtimes/{*musl*,win*}
|
||||||
'';
|
'';
|
||||||
|
|
Loading…
Reference in a new issue