diff options
| author | xeji <36407913+xeji@users.noreply.github.com> | 2018-04-30 22:34:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-30 22:34:53 +0200 |
| commit | 0ca792902c34ca3ddb505df4fa0bbc6151aa3213 (patch) | |
| tree | 1c1b43ff406a76a6335ac10fc9966db1e77063f2 /pkgs | |
| parent | 477f111165e5c63d5fa0572129346ddc3700b6f6 (diff) | |
| parent | d71a8533ff24c510be9692c24df64d8675d7d8b5 (diff) | |
| download | nixlib-0ca792902c34ca3ddb505df4fa0bbc6151aa3213.tar nixlib-0ca792902c34ca3ddb505df4fa0bbc6151aa3213.tar.gz nixlib-0ca792902c34ca3ddb505df4fa0bbc6151aa3213.tar.bz2 nixlib-0ca792902c34ca3ddb505df4fa0bbc6151aa3213.tar.lz nixlib-0ca792902c34ca3ddb505df4fa0bbc6151aa3213.tar.xz nixlib-0ca792902c34ca3ddb505df4fa0bbc6151aa3213.tar.zst nixlib-0ca792902c34ca3ddb505df4fa0bbc6151aa3213.zip | |
Merge pull request #39320 from mt-caret/sweep-visualizer-fix
sweep-visualizer: ffmpeg library clash fix
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/misc/sweep-visualizer/default.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/tools/misc/sweep-visualizer/default.nix b/pkgs/tools/misc/sweep-visualizer/default.nix index c1f3fbea8e5c..cbf849494b75 100644 --- a/pkgs/tools/misc/sweep-visualizer/default.nix +++ b/pkgs/tools/misc/sweep-visualizer/default.nix @@ -24,10 +24,9 @@ buildPhase = ":"; installPhase = '' - mkdir -p $out/lib $out/bin $out/share/sweep-visualizer + mkdir -p $out/bin $out/share/sweep-visualizer mv usr/share/* $out/share mv opt/Sweep\ Visualizer\ BETA/* $out/share/sweep-visualizer/ - mv $out/share/sweep-visualizer/*.so $out/lib/ ln -s $out/share/sweep-visualizer/sweep_visualizer $out/bin/sweep_visualizer ''; @@ -40,12 +39,12 @@ ]; runtimeLibs = lib.makeLibraryPath [ libudev0-shim ]; in '' - for lib in $out/lib/*.so; do - patchelf --set-rpath "$out/lib:${libPath}" $lib + for lib in $out/share/sweep-visualizer/*.so; do + patchelf --set-rpath "$out/share/sweep-visualizer:${libPath}" $lib done patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$out/lib:${libPath}" \ + --set-rpath "$out/share/sweep-visualizer:${libPath}" \ $out/share/sweep-visualizer/sweep_visualizer wrapProgram "$out/bin/sweep_visualizer" --prefix LD_LIBRARY_PATH : ${runtimeLibs} ''; |