mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-09-29 15:43:00 +00:00
Merge pull request #249337 from materusPL/materus/obs-studio-scriptPathFix
This commit is contained in:
commit
2b6c212559
@ -10770,6 +10770,12 @@
|
|||||||
githubId = 7878181;
|
githubId = 7878181;
|
||||||
name = "Mateo Diaz";
|
name = "Mateo Diaz";
|
||||||
};
|
};
|
||||||
|
materus = {
|
||||||
|
email = "materus@podkos.pl";
|
||||||
|
github = "materusPL";
|
||||||
|
githubId = 28183516;
|
||||||
|
name = "Mateusz Słodkowicz";
|
||||||
|
};
|
||||||
math-42 = {
|
math-42 = {
|
||||||
email = "matheus.4200@gmail.com";
|
email = "matheus.4200@gmail.com";
|
||||||
github = "Math-42";
|
github = "Math-42";
|
||||||
|
@ -164,7 +164,7 @@ stdenv.mkDerivation rec {
|
|||||||
video content, efficiently
|
video content, efficiently
|
||||||
'';
|
'';
|
||||||
homepage = "https://obsproject.com";
|
homepage = "https://obsproject.com";
|
||||||
maintainers = with maintainers; [ jb55 MP2E V ];
|
maintainers = with maintainers; [ jb55 MP2E V materus ];
|
||||||
license = licenses.gpl2Plus;
|
license = licenses.gpl2Plus;
|
||||||
platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ];
|
platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ];
|
||||||
mainProgram = "obs";
|
mainProgram = "obs";
|
||||||
|
@ -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
|
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
|
--- a/libobs/obs-nix.c
|
||||||
+++ b/libobs/obs-nix.c
|
+++ b/libobs/obs-nix.c
|
||||||
@@ -56,7 +56,7 @@ const char *get_module_extension(void)
|
@@ -56,7 +56,7 @@ const char *get_module_extension(void)
|
||||||
|
Loading…
Reference in New Issue
Block a user