Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 151c38b5c822
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 99a632679140
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Dec 30, 2019

  1. mirtk: enable tbb support for multithreading

    @lheckemann
    lheckemann committed Dec 30, 2019
    Copy the full SHA
    2c19725 View commit details

Commits on Jan 1, 2020

  1. Merge pull request #76672 from lheckemann/mirtk-tbb 

    mirtk: enable tbb support for multithreading
    @lheckemann
    lheckemann authored Jan 1, 2020
    Copy the full SHA
    99a6326 View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 pkgs/development/libraries/science/biology/mirtk/default.nix
6 changes: 3 additions & 3 deletions pkgs/development/libraries/science/biology/mirtk/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, gtest, fetchFromGitHub, cmake, boost, eigen, python, vtk, zlib }:
{ stdenv, gtest, fetchFromGitHub, cmake, boost, eigen, python, vtk, zlib, tbb }:

stdenv.mkDerivation rec {
version = "2.0.0";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};

cmakeFlags = "-DWITH_VTK=ON -DBUILD_ALL_MODULES=ON";
cmakeFlags = "-DWITH_VTK=ON -DBUILD_ALL_MODULES=ON -DWITH_TBB=ON";

doCheck = true;

@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;

nativeBuildInputs = [ cmake gtest ];
buildInputs = [ boost eigen python vtk zlib ];
buildInputs = [ boost eigen python vtk zlib tbb ];

meta = with stdenv.lib; {
homepage = "https://github.com/BioMedIA/MIRTK";