Skip to content

Commit 6d92b46

Browse files
authored
bug(nix:corretto): use autoPatchelfHook on all systems and ignore als… (#4561)
1 parent 89ae410 commit 6d92b46

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

nix/amazon-corretto-17.nix

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,8 @@ pkgs.stdenv.mkDerivation rec {
3434
# See: https://github.com/NixOS/patchelf/issues/10
3535
dontStrip = 1;
3636

37-
nativeBuildInputs = if (pkgs.stdenv.system == "x86_64-linux") then [
38-
pkgs.autoPatchelfHook
39-
pkgs.alsa-lib
40-
] else
41-
[ ];
42-
4337
buildInputs = with pkgs; [
38+
autoPatchelfHook
4439
cpio
4540
cups
4641
file
@@ -70,6 +65,10 @@ pkgs.stdenv.mkDerivation rec {
7065
zlib
7166
];
7267

68+
# Arm doesn't have this, and because Corretto was built elsewhere, we need
69+
# to change the interpreter: https://github.com/NixOS/patchelf
70+
autoPatchelfIgnoreMissingDeps = [ "libasound.so.2" ];
71+
7372
buildPhase = ''
7473
echo "Corretto is already built"
7574
'';

0 commit comments

Comments
 (0)