summary refs log tree commit diff
diff options
context:
space:
mode:
authorMasayuki Takeda <mtakeda.enigsol@gmail.com>2018-04-22 12:23:19 +0900
committerMasayuki Takeda <mtakeda.enigsol@gmail.com>2018-04-22 12:23:26 +0900
commitd71a8533ff24c510be9692c24df64d8675d7d8b5 (patch)
treea17a0081d26e41aebe8ea31d569698f7c97f5cdf
parentb4baad53e77841a69867bd683fde5fb554a3d92c (diff)
downloadnixpkgs-d71a8533ff24c510be9692c24df64d8675d7d8b5.tar
nixpkgs-d71a8533ff24c510be9692c24df64d8675d7d8b5.tar.gz
nixpkgs-d71a8533ff24c510be9692c24df64d8675d7d8b5.tar.bz2
nixpkgs-d71a8533ff24c510be9692c24df64d8675d7d8b5.tar.lz
nixpkgs-d71a8533ff24c510be9692c24df64d8675d7d8b5.tar.xz
nixpkgs-d71a8533ff24c510be9692c24df64d8675d7d8b5.tar.zst
nixpkgs-d71a8533ff24c510be9692c24df64d8675d7d8b5.zip
ffmpeg library clash fix
-rw-r--r--pkgs/tools/misc/sweep-visualizer/default.nix9
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 c1f3fbea8e5..cbf849494b7 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}
     '';