colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

obs-studio: use fetchpatch to fix arm64 cmake

Browse Source
This commit is contained in:
Walter Huf 2024-01-20 09:10:54 -08:00
parent 8696355652
commit d838162cfb
2 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/video/obs-studio/default.nix
View File

@ -96,7 +96,12 @@ stdenv.mkDerivation (finalAttrs: {
})
# Fix libobs.pc for plugins on non-x86 systems
./fix-arm64-cmake.patch
(fetchpatch {
name = "fix-arm64-cmake.patch";
url = "https://git.alpinelinux.org/aports/plain/community/obs-studio/broken-config.patch?id=a92887564dcc65e07b6be8a6224fda730259ae2b";
hash = "sha256-yRSw4VWDwMwysDB3Hw/tsmTjEQUhipvrVRQcZkbtuoI=";
includes = [ "*/CompilerConfig.cmake" ];
})
];
nativeBuildInputs = [

17
pkgs/applications/video/obs-studio/fix-arm64-cmake.patch
View File

@ -1,17 +0,0 @@
Workaround for https://github.com/obsproject/obs-studio/issues/7972
Based on https://git.alpinelinux.org/aports/tree/community/obs-studio/broken-config.patch?id=a92887564dcc65e07b6be8a6224fda730259ae2b
diff --git a/cmake/Modules/CompilerConfig.cmake b/cmake/Modules/CompilerConfig.cmake
index 41c56da..0535724 100644
--- a/cmake/Modules/CompilerConfig.cmake
+++ b/cmake/Modules/CompilerConfig.cmake
@@ -163,8 +163,7 @@ else()
check_c_compiler_flag("-fopenmp-simd" C_COMPILER_SUPPORTS_OPENMP_SIMD)
check_cxx_compiler_flag("-fopenmp-simd" CXX_COMPILER_SUPPORTS_OPENMP_SIMD)
set(ARCH_SIMD_FLAGS
- -DSIMDE_ENABLE_OPENMP "$<$<AND:$<COMPILE_LANGUAGE:C>,$<BOOL:C_COMPILER_SUPPORTS_OPENMP_SIMD>>:-fopenmp-simd>"
- "$<$<AND:$<COMPILE_LANGUAGE:CXX>,$<BOOL:CXX_COMPILER_SUPPORTS_OPENMP_SIMD>>:-fopenmp-simd>")
+ -DSIMDE_ENABLE_OPENMP -fopenmp-simd)
endif()
endif()