From 6380f7a45c776731c4117921ecddd594bf353538 Mon Sep 17 00:00:00 2001 From: materus Date: Thu, 4 May 2023 13:29:39 +0200 Subject: [PATCH 1/3] maintainers: add materus to maintainer-list --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0333b2024453..9025dd59a851 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10542,6 +10542,12 @@ githubId = 7878181; name = "Mateo Diaz"; }; + materus = { + email = "materus@podkos.pl"; + github = "materusPL"; + githubId = 28183516; + name = "Mateusz Słodkowicz"; + }; math-42 = { email = "matheus.4200@gmail.com"; github = "Math-42"; From 15bf6b71ce88c64b7876e32bcacfd06307755b11 Mon Sep 17 00:00:00 2001 From: materus Date: Tue, 15 Aug 2023 15:02:57 +0200 Subject: [PATCH 2/3] obs-studio: fix script plugin path --- .../video/obs-studio/fix-nix-plugin-path.patch | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) 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) From b1731362ae8805fafa18f5a314a201ec1f75c55f Mon Sep 17 00:00:00 2001 From: materus Date: Thu, 14 Sep 2023 20:13:00 +0200 Subject: [PATCH 3/3] obs-studio: add materus to obs maintainers --- pkgs/applications/video/obs-studio/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 1889d4354fdd..564ea76ca7cf 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -154,7 +154,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";