Skip to content

Commit

Permalink
bug(nix:corretto): use autoPatchelfHook on all systems and ignore als… (
Browse files Browse the repository at this point in the history
  • Loading branch information
dougch authored May 17, 2024
1 parent 89ae410 commit 6d92b46
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions nix/amazon-corretto-17.nix
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,8 @@ pkgs.stdenv.mkDerivation rec {
# See: https://github.com/NixOS/patchelf/issues/10
dontStrip = 1;

nativeBuildInputs = if (pkgs.stdenv.system == "x86_64-linux") then [
pkgs.autoPatchelfHook
pkgs.alsa-lib
] else
[ ];

buildInputs = with pkgs; [
autoPatchelfHook
cpio
cups
file
Expand Down Expand Up @@ -70,6 +65,10 @@ pkgs.stdenv.mkDerivation rec {
zlib
];

# Arm doesn't have this, and because Corretto was built elsewhere, we need
# to change the interpreter: https://github.com/NixOS/patchelf
autoPatchelfIgnoreMissingDeps = [ "libasound.so.2" ];

buildPhase = ''
echo "Corretto is already built"
'';
Expand Down

0 comments on commit 6d92b46

Please sign in to comment.