diff options
| author | Walter Huf <hufman@gmail.com> | 2024-01-20 09:10:54 -0800 |
|---|---|---|
| committer | Walter Huf <hufman@gmail.com> | 2024-01-20 10:44:15 -0800 |
| commit | d838162cfbe8934cea730c165e2e47eda1849175 (patch) | |
| tree | c4ca2caed3f50f7ca4751ad4360846cdf9bd5aca /pkgs/applications/video | |
| parent | 869635565236eee11380a508e1ada53d541be899 (diff) | |
| download | nixlib-d838162cfbe8934cea730c165e2e47eda1849175.tar nixlib-d838162cfbe8934cea730c165e2e47eda1849175.tar.gz nixlib-d838162cfbe8934cea730c165e2e47eda1849175.tar.bz2 nixlib-d838162cfbe8934cea730c165e2e47eda1849175.tar.lz nixlib-d838162cfbe8934cea730c165e2e47eda1849175.tar.xz nixlib-d838162cfbe8934cea730c165e2e47eda1849175.tar.zst nixlib-d838162cfbe8934cea730c165e2e47eda1849175.zip | |
obs-studio: use fetchpatch to fix arm64 cmake
Diffstat (limited to 'pkgs/applications/video')
| -rw-r--r-- | pkgs/applications/video/obs-studio/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/applications/video/obs-studio/fix-arm64-cmake.patch | 17 |
2 files changed, 6 insertions, 18 deletions
diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 0fd2f11900fd..29bb90a9dd8d 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -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 = [ diff --git a/pkgs/applications/video/obs-studio/fix-arm64-cmake.patch b/pkgs/applications/video/obs-studio/fix-arm64-cmake.patch deleted file mode 100644 index 5f5a0553a0e1..000000000000 --- a/pkgs/applications/video/obs-studio/fix-arm64-cmake.patch +++ /dev/null @@ -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() - |