public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #39320 from mt-caret/sweep-visualizer-fix

Browse Source 
sweep-visualizer: ffmpeg library clash fix
This commit is contained in:
xeji 2018-04-30 22:34:53 +02:00 committed by GitHub
commit 0ca792902c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/tools/misc/sweep-visualizer/default.nix
View File

@ -24,10 +24,9 @@
buildPhase = ":"; buildPhase = ":";
installPhase = '' 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 usr/share/* $out/share
mv opt/Sweep\ Visualizer\ BETA/* $out/share/sweep-visualizer/ 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 ln -s $out/share/sweep-visualizer/sweep_visualizer $out/bin/sweep_visualizer
''; '';
@ -40,12 +39,12 @@
]; ];
runtimeLibs = lib.makeLibraryPath [ libudev0-shim ]; runtimeLibs = lib.makeLibraryPath [ libudev0-shim ];
in '' in ''
for lib in $out/lib/*.so; do for lib in $out/share/sweep-visualizer/*.so; do
patchelf --set-rpath "$out/lib:${libPath}" $lib patchelf --set-rpath "$out/share/sweep-visualizer:${libPath}" $lib
done done
patchelf \ patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --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 $out/share/sweep-visualizer/sweep_visualizer
wrapProgram "$out/bin/sweep_visualizer" --prefix LD_LIBRARY_PATH : ${runtimeLibs} wrapProgram "$out/bin/sweep_visualizer" --prefix LD_LIBRARY_PATH : ${runtimeLibs}
''; '';