From 7ee3b0023ff2c7c22b4734cd6f94ed4fd3ebcfce Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Tue, 20 Jan 2015 10:24:27 +0100 Subject: mjpg-streamer: use postFixup instead of dontPatchElf and NIX_LDFLAGS --- pkgs/applications/video/mjpg-streamer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/mjpg-streamer/default.nix b/pkgs/applications/video/mjpg-streamer/default.nix index 47e496ef33c..7cacc4fcf05 100644 --- a/pkgs/applications/video/mjpg-streamer/default.nix +++ b/pkgs/applications/video/mjpg-streamer/default.nix @@ -15,9 +15,9 @@ stdenv.mkDerivation rec { substituteInPlace Makefile "cp plugins\/input_gspcav1\/input_gspcav1.so" "# cp plugins\/input_gspcav1\/input_gspcav1.so" ''; - # Make sure mjpeg-streamer will look in "$out/lib/plugins" for its plugins. - NIX_LDFLAGS = "-rpath $out/lib:$out/lib/plugins"; - dontPatchELF = true; + postFixup = '' + patchelf --set-rpath "$(patchelf --print-rpath $out/bin/mjpg_streamer):$out/lib:$out/lib/plugins" $out/bin/mjpg_streamer + ''; makeFlags = "DESTDIR=$(out)"; -- cgit 1.4.1