Commit d838162c authored by Walter Huf's avatar Walter Huf
Browse files

obs-studio: use fetchpatch to fix arm64 cmake

parent 86963556

pkgs/applications/video/obs-studio/default.nix

+6 −1
Original line number Diff line number Diff line
@@ -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 = [

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

deleted100644 → 0
+0 −17
Original line number Diff line number Diff line 
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()