diff options
author | Peter Simons <simons@cryp.to> | 2021-11-14 10:14:39 +0100 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2021-11-14 10:14:39 +0100 |
commit | 90af5cacfbcf6b3c57a33feb1e19be797b27e7e8 (patch) | |
tree | 7965a9c4d77f00149c35a3e05821a5f59e0bc99d /pkgs/applications/video/obs-studio | |
parent | 566ef06cf5aba71b850838d2fe9bbd7828475e69 (diff) |
obs-studio: avoid double-wrapping the obs binary
Suggested in https://github.com/NixOS/nixpkgs/pull/145664#issuecomment-968107267.
Diffstat (limited to 'pkgs/applications/video/obs-studio')
-rw-r--r-- | pkgs/applications/video/obs-studio/default.nix | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 7454cc1eb297f..31f478c47c0b3 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -21,7 +21,6 @@ , curl , wayland , xorg -, makeWrapper , pkg-config , libvlc , mbedtls @@ -67,7 +66,6 @@ mkDerivation rec { addOpenGLRunpath cmake pkg-config - makeWrapper wrapGAppsHook ] ++ optional scriptingSupport swig; @@ -121,9 +119,13 @@ mkDerivation rec { "-DCEF_ROOT_DIR=../../cef" ]; - qtWrapperArgs = [ - "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ xorg.libX11 libvlc ]}" - ]; + dontWrapGApps = true; + preFixup = '' + qtWrapperArgs+=( + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ xorg.libX11 libvlc ]}" + ''${gappsWrapperArgs[@]} + ) + ''; postFixup = lib.optionalString stdenv.isLinux '' addOpenGLRunpath $out/lib/lib*.so |