Unverified Commit 5fdfa904 authored by kirillrdy's avatar kirillrdy Committed by GitHub
Browse files

openshot-qt: fix runtime error (#404562)

parents 72206406 f83cccf6

pkgs/development/libraries/libopenshot-audio/0001-undef-fpret-on-aarch64-darwin.patch

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

pkgs/development/libraries/libopenshot-audio/default.nix

+2 −7
Original line number Diff line number Diff line
@@ -17,20 +17,15 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "libopenshot-audio";

  version = "0.3.3";

  version = "0.4.0";



  src = fetchFromGitHub {

    owner = "OpenShot";

    repo = "libopenshot-audio";

    rev = "v${finalAttrs.version}";

    hash = "sha256-9iHeVMoyzTQae/PVYJqON0qOPo3SJlhrqbcp2u1Y8MA=";

    hash = "sha256-FTSITx6GoH1cGWeWNWtz1Ih+zozK8aA+u54Y4s0DylQ=";

  };



  patches = [

    # https://forum.juce.com/t/juce-and-macos-11-arm/40285/24

    ./0001-undef-fpret-on-aarch64-darwin.patch

  ];



  nativeBuildInputs = [

    cmake

    doxygen

pkgs/development/libraries/libopenshot/default.nix

+4 −2
Original line number Diff line number Diff line
@@ -21,13 +21,13 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "libopenshot";

  version = "0.3.3";

  version = "0.4.0";



  src = fetchFromGitHub {

    owner = "OpenShot";

    repo = "libopenshot";

    rev = "v${finalAttrs.version}";

    hash = "sha256-9X2UIRDD+1kNLbV8AnnPabdO2M0OfTDxQ7xyZtsE10k=";

    hash = "sha256-zroTnJRYIIglhha6jQvaVNTgnIV6kUWcu7s5zEvgH6Q=";

  };



  patches = lib.optionals stdenv.hostPlatform.isDarwin [
@@ -69,6 +69,8 @@ stdenv.mkDerivation (finalAttrs: { 


  cmakeFlags = [

    (lib.cmakeBool "ENABLE_RUBY" false)

    (lib.cmakeBool "ENABLE_PYTHON" true)

    (lib.cmakeOptionType "filepath" "PYTHON_EXECUTABLE" (lib.getExe python3))

    (lib.cmakeOptionType "filepath" "PYTHON_MODULE_PATH" python3.sitePackages)

  ];

pkgs/top-level/all-packages.nix

+1 −3
Original line number Diff line number Diff line
@@ -5786,9 +5786,7 @@ with pkgs; 
      graalvmDrv = graalvmPackages.graalvm-ce;

    }).override;













  openshot-qt = libsForQt5.callPackage ../applications/video/openshot-qt {













    python3 = python311;













  };













  openshot-qt = libsForQt5.callPackage ../applications/video/openshot-qt { };





























  inherit (callPackage ../development/compilers/julia { })















    julia_19-bin

































pkgs/top-level/qt5-packages.nix



+1
−3






























Original line number
Diff line number
Diff line








@@ -190,9 +190,7 @@ makeScopeWithSplicing' {





























        liblastfm = callPackage ../development/libraries/liblastfm { };





























        libopenshot = callPackage ../development/libraries/libopenshot {













          python3 = pkgs.python311;













        };













        libopenshot = callPackage ../development/libraries/libopenshot { };































        packagekit-qt = callPackage ../tools/package-management/packagekit/qt.nix { };