From c4775c6038c15d0f41615f50820e5931e2c05fde Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Thu, 21 Oct 2021 15:14:36 -0700 Subject: [PATCH] hqplayerd: add OpenGL to runpath --- pkgs/servers/hqplayerd/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/hqplayerd/default.nix b/pkgs/servers/hqplayerd/default.nix index d2b46097ac10..3bda53ad1404 100644 --- a/pkgs/servers/hqplayerd/default.nix +++ b/pkgs/servers/hqplayerd/default.nix @@ -1,5 +1,6 @@ { stdenv , alsa-lib +, addOpenGLRunpath , autoPatchelfHook , cairo , fetchurl @@ -28,7 +29,7 @@ stdenv.mkDerivation rec { ${rpmextract}/bin/rpmextract $src ''; - nativeBuildInputs = [ autoPatchelfHook rpmextract ]; + nativeBuildInputs = [ addOpenGLRunpath autoPatchelfHook rpmextract ]; buildInputs = [ alsa-lib @@ -86,8 +87,12 @@ stdenv.mkDerivation rec { --replace "NetworkManager-wait-online.service" "" ''; - postFixup = '' - patchelf --replace-needed libomp.so.5 libomp.so $out/bin/hqplayerd + # NB: addOpenGLRunpath needs to run _after_ autoPatchelfHook, which runs in + # postFixup, so we tack it on here. + doInstallCheck = true; + installCheckPhase = '' + addOpenGLRunpath $out/bin/hqplayerd + $out/bin/hqplayerd --version ''; meta = with lib; {