commit 5261c3cda1fdd62312c0b9febd1181faa672e1c2 · pyrox.dev/nixpkgs

+17 -15

pkgs/by-name/fe/febio-studio/package.nix

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
        
         stdenv,

     

       4
       4
       -
         overrideSDK,

     

       5
       4
        
         fetchFromGitHub,

     

       6
       5
        
         cmake,

     

       7
       6
        
         ninja,

     
···

       10
       9
        
         qt6Packages,

     

       11
       10
        
         febio,

     

       12
       11
        
         glew,

     

       12
       12
       +
         apple-sdk_11,

     

       13
       13
       +
         darwinMinVersionHook,

     

       14
       14
       +
         fetchpatch,

     

       13
       15
        
         sshSupport ? true,

     

       14
       16
        
         openssl,

     

       15
       17
        
         libssh,

     
···

       23
       25
        
         withCadFeatures ? false,

     

       24
       26
        
       }:

     

       25
       27
        
       

     

       26
       26
       -
       let

     

       27
       27
       -
         stdenv' =

     

       28
       28
       -
           if stdenv.hostPlatform.isDarwin then

     

       29
       29
       -
             overrideSDK stdenv {

     

       30
       30
       -
               darwinSdkVersion = "11.0";

     

       31
       31
       -
               darwinMinVersion = "10.15";

     

       32
       32
       -
             }

     

       33
       33
       -
           else

     

       34
       34
       -
             stdenv;

     

       35
       35
       -
       in

     

       36
       36
       -
       

     

       37
       37
       -
       stdenv'.mkDerivation (finalAttrs: {

     

       28
       28
       +
       stdenv.mkDerivation (finalAttrs: {

     

       38
       29
        
         pname = "febio-studio";

     

       39
       30
        
         version = "2.7";

     

       40
       31
        
       

     
···

       45
       36
        
           hash = "sha256-ggIzz6bvNjqlI8s31EVnbM0TOspBSc9/myKpWukS3MU=";

     

       46
       37
        
         };

     

       47
       38
        
       

     

       48
       48
       -
         patches = [ ./cmake-install.patch ];

     

       39
       39
       +
         patches = [

     

       40
       40
       +
           ./cmake-install.patch

     

       41
       41
       +
           # Fix qt 6.8 compile, can be removed after next release

     

       42
       42
       +
           (fetchpatch {

     

       43
       43
       +
             url = "https://github.com/febiosoftware/FEBioStudio/commit/15524d958a6f5ef81ccee58b4efa1ea25de91543.patch";

     

       44
       44
       +
             hash = "sha256-LRToK1/RQC+bLXgroDTQOV6H8pI+IZ38Y0nsl/Fz1WE=";

     

       45
       45
       +
           })

     

       46
       46
       +
         ];

     

       49
       47
        
       

     

       50
       48
        
         cmakeFlags =

     

       51
       49
        
           [ (lib.cmakeFeature "Qt_Root" "${qt6Packages.qtbase}") ]

     
···

       76
       74
        
           ]

     

       77
       75
        
           ++ lib.optional tetgenSupport tetgen

     

       78
       76
        
           ++ lib.optional ffmpegSupport ffmpeg

     

       79
       79
       -
           ++ lib.optional dicomSupport dcmtk;

     

       77
       77
       +
           ++ lib.optional dicomSupport dcmtk

     

       78
       78
       +
           ++ lib.optionals stdenv.hostPlatform.isDarwin [

     

       79
       79
       +
             apple-sdk_11

     

       80
       80
       +
             (darwinMinVersionHook "10.15")

     

       81
       81
       +
           ];

     

       80
       82
        
       

     

       81
       83
        
         meta = {

     

       82
       84
        
           description = "FEBio Suite Solver";

+5 -10

pkgs/by-name/fe/febio/package.nix

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
        
         stdenv,

     

       4
       4
       -
         overrideSDK,

     

       5
       4
        
         fetchFromGitHub,

     

       6
       5
        
         fetchpatch2,

     

       7
       6
        
         substituteAll,

     

       7
       7
       +
         apple-sdk_11,

     

       8
       8
        
         cmake,

     

       9
       9
       +
         darwinMinVersionHook,

     

       9
       10
        
         ninja,

     

       10
       11
        
         zlib,

     

       11
       11
       -
         darwin,

     

       12
       12
        
         mklSupport ? true,

     

       13
       13
        
         mkl,

     

       14
       14
        
       }:

     

       15
       15
        
       

     

       16
       16
       -
       let

     

       17
       17
       -
         stdenv' = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;

     

       18
       18
       -
       in

     

       19
       19
       -
       

     

       20
       20
       -
       stdenv'.mkDerivation (finalAttrs: {

     

       16
       16
       +
       stdenv.mkDerivation (finalAttrs: {

     

       21
       17
        
         pname = "FEBio";

     

       22
       18
        
         version = "4.7";

     

       23
       19
        
       

     
···

       57
       53
        
           [ zlib ]

     

       58
       54
        
           ++ lib.optionals mklSupport [ mkl ]

     

       59
       55
        
           ++ lib.optionals stdenv.hostPlatform.isDarwin [

     

       60
       60
       -
             darwin.apple_sdk.frameworks.CoreGraphics

     

       61
       61
       -
             darwin.apple_sdk.frameworks.CoreVideo

     

       62
       62
       -
             darwin.apple_sdk.frameworks.Accelerate

     

       56
       56
       +
             apple-sdk_11

     

       57
       57
       +
             (darwinMinVersionHook "10.15")

     

       63
       58
        
           ];

     

       64
       59
        
       

     

       65
       60
        
         meta = {