openshot-qt: fix runtime error (#404562)

authored by

kirillrdy and committed by
GitHub
5fdfa904 72206406

+8 -28
-13
pkgs/development/libraries/libopenshot-audio/0001-undef-fpret-on-aarch64-darwin.patch
··· 1 - diff --git a/JuceLibraryCode/modules/juce_core/native/juce_osx_ObjCHelpers.h b/JuceLibraryCode/modules/juce_core/native/juce_osx_ObjCHelpers.h 2 - index 2593790..0b5983d 100644 3 - --- a/JuceLibraryCode/modules/juce_core/native/juce_osx_ObjCHelpers.h 4 - +++ b/JuceLibraryCode/modules/juce_core/native/juce_osx_ObjCHelpers.h 5 - @@ -209,7 +209,7 @@ static inline ReturnValue ObjCMsgSendSuper (struct objc_super* s, SEL sel, Param 6 - typedef id (*MsgSendSuperFn) (struct objc_super*, SEL, ...); 7 - static inline MsgSendSuperFn getMsgSendSuperFn() noexcept { return (MsgSendSuperFn) (void*) objc_msgSendSuper; } 8 - 9 - -#if ! JUCE_IOS 10 - +#if JUCE_INTEL && ! JUCE_IOS 11 - typedef double (*MsgSendFPRetFn) (id, SEL op, ...); 12 - static inline MsgSendFPRetFn getMsgSendFPRetFn() noexcept { return (MsgSendFPRetFn) (void*) objc_msgSend_fpret; } 13 - #endif
+2 -7
pkgs/development/libraries/libopenshot-audio/default.nix
··· 17 17 18 18 stdenv.mkDerivation (finalAttrs: { 19 19 pname = "libopenshot-audio"; 20 - version = "0.3.3"; 20 + version = "0.4.0"; 21 21 22 22 src = fetchFromGitHub { 23 23 owner = "OpenShot"; 24 24 repo = "libopenshot-audio"; 25 25 rev = "v${finalAttrs.version}"; 26 - hash = "sha256-9iHeVMoyzTQae/PVYJqON0qOPo3SJlhrqbcp2u1Y8MA="; 26 + hash = "sha256-FTSITx6GoH1cGWeWNWtz1Ih+zozK8aA+u54Y4s0DylQ="; 27 27 }; 28 - 29 - patches = [ 30 - # https://forum.juce.com/t/juce-and-macos-11-arm/40285/24 31 - ./0001-undef-fpret-on-aarch64-darwin.patch 32 - ]; 33 28 34 29 nativeBuildInputs = [ 35 30 cmake
+4 -2
pkgs/development/libraries/libopenshot/default.nix
··· 21 21 22 22 stdenv.mkDerivation (finalAttrs: { 23 23 pname = "libopenshot"; 24 - version = "0.3.3"; 24 + version = "0.4.0"; 25 25 26 26 src = fetchFromGitHub { 27 27 owner = "OpenShot"; 28 28 repo = "libopenshot"; 29 29 rev = "v${finalAttrs.version}"; 30 - hash = "sha256-9X2UIRDD+1kNLbV8AnnPabdO2M0OfTDxQ7xyZtsE10k="; 30 + hash = "sha256-zroTnJRYIIglhha6jQvaVNTgnIV6kUWcu7s5zEvgH6Q="; 31 31 }; 32 32 33 33 patches = lib.optionals stdenv.hostPlatform.isDarwin [ ··· 69 69 70 70 cmakeFlags = [ 71 71 (lib.cmakeBool "ENABLE_RUBY" false) 72 + (lib.cmakeBool "ENABLE_PYTHON" true) 73 + (lib.cmakeOptionType "filepath" "PYTHON_EXECUTABLE" (lib.getExe python3)) 72 74 (lib.cmakeOptionType "filepath" "PYTHON_MODULE_PATH" python3.sitePackages) 73 75 ]; 74 76
+1 -3
pkgs/top-level/all-packages.nix
··· 5786 5786 graalvmDrv = graalvmPackages.graalvm-ce; 5787 5787 }).override; 5788 5788 5789 - openshot-qt = libsForQt5.callPackage ../applications/video/openshot-qt { 5790 - python3 = python311; 5791 - }; 5789 + openshot-qt = libsForQt5.callPackage ../applications/video/openshot-qt { }; 5792 5790 5793 5791 inherit (callPackage ../development/compilers/julia { }) 5794 5792 julia_19-bin
+1 -3
pkgs/top-level/qt5-packages.nix
··· 190 190 191 191 liblastfm = callPackage ../development/libraries/liblastfm { }; 192 192 193 - libopenshot = callPackage ../development/libraries/libopenshot { 194 - python3 = pkgs.python311; 195 - }; 193 + libopenshot = callPackage ../development/libraries/libopenshot { }; 196 194 197 195 packagekit-qt = callPackage ../tools/package-management/packagekit/qt.nix { }; 198 196