From c970f0f7cd60d9d98b11729e5a213711bdabff28 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sun, 3 Nov 2024 17:40:07 -0600 Subject: [PATCH] febio-studio: darwin sdk refactor --- pkgs/by-name/fe/febio-studio/package.nix | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/fe/febio-studio/package.nix b/pkgs/by-name/fe/febio-studio/package.nix index b9605413575d..e7f6f35f01b7 100644 --- a/pkgs/by-name/fe/febio-studio/package.nix +++ b/pkgs/by-name/fe/febio-studio/package.nix @@ -1,7 +1,6 @@ { lib, stdenv, - overrideSDK, fetchFromGitHub, cmake, ninja, @@ -10,6 +9,8 @@ qt6Packages, febio, glew, + apple-sdk_11, + darwinMinVersionHook, sshSupport ? true, openssl, libssh, @@ -23,18 +24,7 @@ withCadFeatures ? false, }: -let - stdenv' = - if stdenv.hostPlatform.isDarwin then - overrideSDK stdenv { - darwinSdkVersion = "11.0"; - darwinMinVersion = "10.15"; - } - else - stdenv; -in - -stdenv'.mkDerivation (finalAttrs: { +stdenv.mkDerivation (finalAttrs: { pname = "febio-studio"; version = "2.7"; @@ -76,7 +66,11 @@ stdenv'.mkDerivation (finalAttrs: { ] ++ lib.optional tetgenSupport tetgen ++ lib.optional ffmpegSupport ffmpeg - ++ lib.optional dicomSupport dcmtk; + ++ lib.optional dicomSupport dcmtk + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + apple-sdk_11 + (darwinMinVersionHook "10.15") + ]; meta = { description = "FEBio Suite Solver";