diff options
| author | Artturi <Artturin@artturin.com> | 2023-09-23 06:00:54 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-23 06:00:54 +0300 |
| commit | 2b6c2125594be41fec07ee7030d9898eccd35742 (patch) | |
| tree | 4ca407af134c1e8ed90873029378704095e98893 /pkgs/applications/video/obs-studio | |
| parent | 4d419fa923fc3eac94c9a3c113b4926e6de17465 (diff) | |
| parent | b1731362ae8805fafa18f5a314a201ec1f75c55f (diff) | |
| download | nixlib-2b6c2125594be41fec07ee7030d9898eccd35742.tar nixlib-2b6c2125594be41fec07ee7030d9898eccd35742.tar.gz nixlib-2b6c2125594be41fec07ee7030d9898eccd35742.tar.bz2 nixlib-2b6c2125594be41fec07ee7030d9898eccd35742.tar.lz nixlib-2b6c2125594be41fec07ee7030d9898eccd35742.tar.xz nixlib-2b6c2125594be41fec07ee7030d9898eccd35742.tar.zst nixlib-2b6c2125594be41fec07ee7030d9898eccd35742.zip | |
Merge pull request #249337 from materusPL/materus/obs-studio-scriptPathFix
Diffstat (limited to 'pkgs/applications/video/obs-studio')
| -rw-r--r-- | pkgs/applications/video/obs-studio/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/video/obs-studio/fix-nix-plugin-path.patch | 15 |
2 files changed, 15 insertions, 2 deletions
diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index fd08ebb3bf0b..8b3866d624bf 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -164,7 +164,7 @@ stdenv.mkDerivation rec { video content, efficiently ''; homepage = "https://obsproject.com"; - maintainers = with maintainers; [ jb55 MP2E V ]; + maintainers = with maintainers; [ jb55 MP2E V materus ]; license = licenses.gpl2Plus; platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; mainProgram = "obs"; diff --git a/pkgs/applications/video/obs-studio/fix-nix-plugin-path.patch b/pkgs/applications/video/obs-studio/fix-nix-plugin-path.patch index d2c08c308bce..baf45104e6a8 100644 --- a/pkgs/applications/video/obs-studio/fix-nix-plugin-path.patch +++ b/pkgs/applications/video/obs-studio/fix-nix-plugin-path.patch @@ -1,5 +1,18 @@ +diff --git a/cmake/Modules/ObsDefaults_Linux.cmake b/cmake/Modules/ObsDefaults_Linux.cmake +index d1e58a083..a03c6b98e 100644 +--- a/cmake/Modules/ObsDefaults_Linux.cmake ++++ b/cmake/Modules/ObsDefaults_Linux.cmake +@@ -76,7 +76,7 @@ macro(setup_obs_project) + set(OBS_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/") + set(OBS_DATA_PATH "${OBS_DATA_DESTINATION}") + +- set(OBS_SCRIPT_PLUGIN_PATH "${CMAKE_INSTALL_PREFIX}/${OBS_SCRIPT_PLUGIN_DESTINATION}") ++ set(OBS_SCRIPT_PLUGIN_PATH "${OBS_SCRIPT_PLUGIN_DESTINATION}") + set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${OBS_LIBRARY_DESTINATION}") + else() + set(OBS_EXECUTABLE_DESTINATION "bin/${_ARCH_SUFFIX}bit") diff --git a/libobs/obs-nix.c b/libobs/obs-nix.c -index 36aac7097..801cec788 100644 +index b006a5598..531655eb3 100644 --- a/libobs/obs-nix.c +++ b/libobs/obs-nix.c @@ -56,7 +56,7 @@ const char *get_module_extension(void) |