ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-22 04:57:56 +03:00
Code Issues Projects Releases Wiki Activity

libsForQt5.libopenshot-audio: convert to patch

Browse Source
This commit is contained in:
Weijia Wang 2022-12-28 14:39:41 +01:00
parent abc198bf73
commit d1b54838bd
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/video/openshot-qt/libopenshot-audio.nix
View File

@ -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

13
pkgs/applications/video/openshot-qt/undef-fpret-on-aarch64-darwin.patch Normal file
View File

@ -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