From 6354dcddb3e226c6300951aa99ed5b7a107ca58e Mon Sep 17 00:00:00 2001 From: annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> Date: Mon, 15 Jan 2024 21:27:01 +0000 Subject: [PATCH] avidemux: make install path match rpath; fix runtime --- pkgs/applications/video/avidemux/default.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix index 856bc95a477d..6592173bb511 100644 --- a/pkgs/applications/video/avidemux/default.nix +++ b/pkgs/applications/video/avidemux/default.nix @@ -83,6 +83,11 @@ stdenv.mkDerivation rec { ln -s "$out/bin/avidemux3_${default}" "$out/bin/avidemux" + # make the install path match the rpath + if [[ -d ''${!outputLib}/lib64 ]]; then + mv ''${!outputLib}/lib64 ''${!outputLib}/lib + ln -s lib ''${!outputLib}/lib64 + fi fixupPhase ''; @@ -93,13 +98,5 @@ stdenv.mkDerivation rec { # "CPU not supported" errors on AArch64 platforms = [ "i686-linux" "x86_64-linux" ]; license = licenses.gpl2; - # Downstream we experience: - # - # https://github.com/NixOS/nixpkgs/issues/239424 - # - # Upstream doesn't have a contact page / Bug tracker, so it's not easy to - # notify them about it. Using firejail might help, as some commented - # downstream. - broken = true; }; }