diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2022-12-28 14:39:41 +0100 |
|---|---|---|
| committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2022-12-28 14:39:41 +0100 |
| commit | d1b54838bd6bd1c9ecaea34ec5c5b02edcf5ae1c (patch) | |
| tree | d3fd312383661a733c05a8e9d91f0dc08e80f080 /pkgs/applications/video/openshot-qt | |
| parent | abc198bf73e5ded6f1eebb4982596f114d1186ba (diff) | |
libsForQt5.libopenshot-audio: convert to patch
Diffstat (limited to 'pkgs/applications/video/openshot-qt')
| -rw-r--r-- | pkgs/applications/video/openshot-qt/libopenshot-audio.nix | 10 | ||||
| -rw-r--r-- | pkgs/applications/video/openshot-qt/undef-fpret-on-aarch64-darwin.patch | 13 |
2 files changed, 18 insertions, 5 deletions
diff --git a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix index a5f3cbf1fda25..438eae4670980 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , alsa-lib , cmake , doxygen @@ -28,11 +29,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-XtwTZsj/L/sw/28E7Qr5UyghGlBFFXvbmZLGXBB8vg0="; }; - # https://github.com/OpenShot/libopenshot-audio/issues/112 - postPatch = '' - substituteInPlace JuceLibraryCode/modules/juce_core/native/juce_osx_ObjCHelpers.h \ - --replace "#if ! JUCE_IOS" "#if ! JUCE_IOS && ! JUCE_ARM" - ''; + patches = [ + # https://forum.juce.com/t/juce-and-macos-11-arm/40285/24 + ./undef-fpret-on-aarch64-darwin.patch + ]; nativeBuildInputs = [ cmake diff --git a/pkgs/applications/video/openshot-qt/undef-fpret-on-aarch64-darwin.patch b/pkgs/applications/video/openshot-qt/undef-fpret-on-aarch64-darwin.patch new file mode 100644 index 0000000000000..c391f77dda8b7 --- /dev/null +++ b/pkgs/applications/video/openshot-qt/undef-fpret-on-aarch64-darwin.patch @@ -0,0 +1,13 @@ +diff --git a/JuceLibraryCode/modules/juce_core/native/juce_osx_ObjCHelpers.h b/JuceLibraryCode/modules/juce_core/native/juce_osx_ObjCHelpers.h +index 2593790..0b5983d 100644 +--- a/JuceLibraryCode/modules/juce_core/native/juce_osx_ObjCHelpers.h ++++ b/JuceLibraryCode/modules/juce_core/native/juce_osx_ObjCHelpers.h +@@ -209,7 +209,7 @@ static inline ReturnValue ObjCMsgSendSuper (struct objc_super* s, SEL sel, Param + typedef id (*MsgSendSuperFn) (struct objc_super*, SEL, ...); + static inline MsgSendSuperFn getMsgSendSuperFn() noexcept { return (MsgSendSuperFn) (void*) objc_msgSendSuper; } + +-#if ! JUCE_IOS ++#if JUCE_INTEL && ! JUCE_IOS + typedef double (*MsgSendFPRetFn) (id, SEL op, ...); + static inline MsgSendFPRetFn getMsgSendFPRetFn() noexcept { return (MsgSendFPRetFn) (void*) objc_msgSend_fpret; } + #endif |