From f1909d639c422f04451b13dd9af842bfcdc4a77a Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Tue, 6 May 2025 15:17:39 +1000 Subject: [PATCH 1/4] libsForQt5.libopenshot-audio: 0.3.3 -> 0.4.0 release: https://github.com/OpenShot/libopenshot-audio/releases/tag/v0.4.0 --- .../0001-undef-fpret-on-aarch64-darwin.patch | 13 ------------- .../libraries/libopenshot-audio/default.nix | 9 ++------- 2 files changed, 2 insertions(+), 20 deletions(-) delete mode 100644 pkgs/development/libraries/libopenshot-audio/0001-undef-fpret-on-aarch64-darwin.patch diff --git a/pkgs/development/libraries/libopenshot-audio/0001-undef-fpret-on-aarch64-darwin.patch b/pkgs/development/libraries/libopenshot-audio/0001-undef-fpret-on-aarch64-darwin.patch deleted file mode 100644 index c391f77dda8b..000000000000 --- a/pkgs/development/libraries/libopenshot-audio/0001-undef-fpret-on-aarch64-darwin.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 diff --git a/pkgs/development/libraries/libopenshot-audio/default.nix b/pkgs/development/libraries/libopenshot-audio/default.nix index 8e861f455809..bbd92ab9e625 100644 --- a/pkgs/development/libraries/libopenshot-audio/default.nix +++ b/pkgs/development/libraries/libopenshot-audio/default.nix @@ -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 From 937de3982775f0432ffc4405d14e2f3e057ed328 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Tue, 6 May 2025 15:18:26 +1000 Subject: [PATCH 2/4] libsForQt5.libopenshot: 0.3.3 -> 0.4.0 release: https://github.com/OpenShot/libopenshot/releases/tag/v0.4.0 --- pkgs/development/libraries/libopenshot/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libopenshot/default.nix b/pkgs/development/libraries/libopenshot/default.nix index 478e5e50ade8..2d8798acff10 100644 --- a/pkgs/development/libraries/libopenshot/default.nix +++ b/pkgs/development/libraries/libopenshot/default.nix @@ -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) ]; From 8bdf8af6c54ed892d109298652a82b0b27c32f98 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Tue, 6 May 2025 15:20:04 +1000 Subject: [PATCH 3/4] libsForQt5.libopenshot: unpin python --- pkgs/top-level/qt5-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 2fab1e0d8527..1555a92859f7 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -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 { }; From f83cccf6ff64bba2b45d9f9e19ab950aec2b82f5 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Tue, 6 May 2025 15:20:31 +1000 Subject: [PATCH 4/4] openshot-qt: unpin python --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6215f373cde0..0258778397e2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5779,9 +5779,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