mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 00:12:56 +00:00
febio-studio: fix qt 6.8 build
Use a commit from upstream that hasn't been released to support qt 6.8
(cherry picked from commit 2e61f3236d
)
This commit is contained in:
parent
38f1f2d104
commit
4a3b98d09f
@ -11,6 +11,7 @@
|
|||||||
glew,
|
glew,
|
||||||
apple-sdk_11,
|
apple-sdk_11,
|
||||||
darwinMinVersionHook,
|
darwinMinVersionHook,
|
||||||
|
fetchpatch,
|
||||||
sshSupport ? true,
|
sshSupport ? true,
|
||||||
openssl,
|
openssl,
|
||||||
libssh,
|
libssh,
|
||||||
@ -35,7 +36,14 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
hash = "sha256-ggIzz6bvNjqlI8s31EVnbM0TOspBSc9/myKpWukS3MU=";
|
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 =
|
cmakeFlags =
|
||||||
[ (lib.cmakeFeature "Qt_Root" "${qt6Packages.qtbase}") ]
|
[ (lib.cmakeFeature "Qt_Root" "${qt6Packages.qtbase}") ]
|
||||||
|
Loading…
Reference in New Issue
Block a user