diff options
| author | Bob van der Linden <bobvanderlinden@gmail.com> | 2015-01-20 10:24:27 +0100 |
|---|---|---|
| committer | Bob van der Linden <bobvanderlinden@gmail.com> | 2015-01-20 10:24:27 +0100 |
| commit | 7ee3b0023ff2c7c22b4734cd6f94ed4fd3ebcfce (patch) | |
| tree | 5602e58bbbda00dff42fa2c5550262c8f59ed3cc | |
| parent | 54c9c0b4a70635f4158fcc48e60168e1e1406fa0 (diff) | |
| download | nixpkgs-7ee3b0023ff2c7c22b4734cd6f94ed4fd3ebcfce.tar nixpkgs-7ee3b0023ff2c7c22b4734cd6f94ed4fd3ebcfce.tar.gz nixpkgs-7ee3b0023ff2c7c22b4734cd6f94ed4fd3ebcfce.tar.bz2 nixpkgs-7ee3b0023ff2c7c22b4734cd6f94ed4fd3ebcfce.tar.lz nixpkgs-7ee3b0023ff2c7c22b4734cd6f94ed4fd3ebcfce.tar.xz nixpkgs-7ee3b0023ff2c7c22b4734cd6f94ed4fd3ebcfce.tar.zst nixpkgs-7ee3b0023ff2c7c22b4734cd6f94ed4fd3ebcfce.zip | |
mjpg-streamer: use postFixup instead of dontPatchElf and NIX_LDFLAGS
| -rw-r--r-- | pkgs/applications/video/mjpg-streamer/default.nix | 6 |
1 files 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)"; |