commit f19ed998f6d51a5318e7d3de3ef2c4968dc45ac7 · pyrox.dev/nixpkgs

+10 -4
pkgs/development/libraries/embree/2.x.nix
···

       5
       5
        
         cmake,

     

       6
       6
        
         pkg-config,

     

       7
       7
        
         ispc,

     

       8
       8
       -
         tbb,

     

       8
       8
       +
         tbb_2020_3,

     

       9
       9
        
         glfw,

     

       10
       10
        
         openimageio,

     

       11
       11
        
         libjpeg,

     

       12
       12
        
         libpng,

     

       13
       13
        
         libpthreadstubs,

     

       14
       14
        
         libX11,

     

       15
       15
       +
         python3Packages,

     

       15
       16
        
         nix-update-script,

     

       16
       17
        
       }:

     

       17
       18
        
       

     

       18
       19
        
       stdenv.mkDerivation (finalAttrs: {

     

       19
       20
        
         pname = "embree";

     

       20
       20
       -
         version = "2.17.4";

     

       21
       21
       +
         version = "2.17.7";

     

       21
       22
        
       

     

       22
       23
        
         src = fetchFromGitHub {

     

       23
       24
        
           owner = "embree";

     

       24
       25
        
           repo = "embree";

     

       25
       26
        
           tag = "v${finalAttrs.version}";

     

       26
       26
       -
           sha256 = "0q3r724r58j4b6cbyy657fsb78z7a2c7d5mwdp7552skynsn2mn9";

     

       27
       27
       +
           hash = "sha256-FD/ITZBJnYy1F+x4jLTVTsGsNKy/mS7OYWP06NoHZqc=";

     

       27
       28
        
         };

     

       28
       29
        
       

     

       29
       30
        
         cmakeFlags = [ "-DEMBREE_TUTORIALS=OFF" ];

     
···

       34
       35
        
         ];

     

       35
       36
        
         buildInputs = [

     

       36
       37
        
           ispc

     

       37
       37
       -
           tbb

     

       38
       38
       +
           # tbb_2021_0 is not backward compatible

     

       39
       39
       +
           tbb_2020_3

     

       38
       40
        
           glfw

     

       39
       41
        
           openimageio

     

       40
       42
        
           libjpeg

     
···

       49
       51
        
               "--version-regex"

     

       50
       52
        
               "v(2.*)"

     

       51
       53
        
             ];

     

       54
       54
       +
           };

     

       55
       55
       +
           tbb = tbb_2020_3;

     

       56
       56
       +
           tests = {

     

       57
       57
       +
             inherit (python3Packages) embreex;

     

       52
       58
        
           };

     

       53
       59
        
         };

     

       54
       60