alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #207950 from wegank/libopenshot

Browse source 
libsForQt5.libopenshot-audio: unbreak on aarch64-darwin
This commit is contained in:
Anderson Torres 2022-12-28 17:32:45 -03:00 committed by GitHub
parent 4032717bd1 d1b54838bd
commit a79e10a205
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/applications/video/openshot-qt/libopenshot-audio.nix
View file

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, alsa-lib
, cmake
, doxygen
@ -28,6 +29,11 @@ stdenv.mkDerivation rec {
sha256 = "sha256-XtwTZsj/L/sw/28E7Qr5UyghGlBFFXvbmZLGXBB8vg0=";
};
patches = [
# https://forum.juce.com/t/juce-and-macos-11-arm/40285/24
./undef-fpret-on-aarch64-darwin.patch
];
nativeBuildInputs = [
cmake
doxygen
@ -63,7 +69,5 @@ stdenv.mkDerivation rec {
license = with licenses; gpl3Plus;
maintainers = with maintainers; [ AndersonTorres ];
platforms = with platforms; unix;
# never built on aarch64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isAarch64;
};
}

3
pkgs/applications/video/openshot-qt/libopenshot.nix
View file

@ -35,8 +35,9 @@ stdenv.mkDerivation rec {
export _REL_PYTHON_MODULE_PATH=$(toPythonPath $out)
'';
nativeBuildInputs = [
nativeBuildInputs = lib.optionals stdenv.isLinux [
alsa-lib
] ++ [
cmake
doxygen
pkg-config

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