From 2e61f3236def89fc736995fd52555fe952cf5ac5 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 18 Nov 2024 10:38:48 -0600 Subject: [PATCH] febio-studio: fix qt 6.8 build Use a commit from upstream that hasn't been released to support qt 6.8 --- pkgs/by-name/fe/febio-studio/package.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/fe/febio-studio/package.nix b/pkgs/by-name/fe/febio-studio/package.nix index e7f6f35f01b7..a875cfb0e635 100644 --- a/pkgs/by-name/fe/febio-studio/package.nix +++ b/pkgs/by-name/fe/febio-studio/package.nix @@ -11,6 +11,7 @@ glew, apple-sdk_11, darwinMinVersionHook, + fetchpatch, sshSupport ? true, openssl, libssh, @@ -35,7 +36,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-ggIzz6bvNjqlI8s31EVnbM0TOspBSc9/myKpWukS3MU="; }; - patches = [ ./cmake-install.patch ]; + patches = [ + ./cmake-install.patch + # Fix qt 6.8 compile, can be removed after next release + (fetchpatch { + url = "https://github.com/febiosoftware/FEBioStudio/commit/15524d958a6f5ef81ccee58b4efa1ea25de91543.patch"; + hash = "sha256-LRToK1/RQC+bLXgroDTQOV6H8pI+IZ38Y0nsl/Fz1WE="; + }) + ]; cmakeFlags = [ (lib.cmakeFeature "Qt_Root" "${qt6Packages.qtbase}") ]