From fa1e6b8f457021652df67d7c823f19fe0d11ff9f Mon Sep 17 00:00:00 2001 From: Matt McHenry Date: Sat, 4 Nov 2023 17:13:29 -0400 Subject: [PATCH] avidemux: fix missing libraries at startup by adding $out/lib to LD_LIBRARY_PATH, as suggested by @revuwa and @mgurlitz in #239424 fixes #239424 --- pkgs/applications/video/avidemux/default.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix index 856bc95a477d6..a445a9832a11c 100644 --- a/pkgs/applications/video/avidemux/default.nix +++ b/pkgs/applications/video/avidemux/default.nix @@ -57,7 +57,11 @@ stdenv.mkDerivation rec { buildCommand = let wrapWith = makeWrapper: filename: - "${makeWrapper} ${filename} --set ADM_ROOT_DIR $out --prefix LD_LIBRARY_PATH : ${libXext}/lib"; + '' + ${makeWrapper} ${filename} \ + --set ADM_ROOT_DIR $out \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libXext (placeholder "out") ]} + ''; wrapQtApp = wrapWith "wrapQtApp"; wrapProgram = wrapWith "wrapProgram"; in '' @@ -93,13 +97,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; }; }