Merge branch 'itk-shared' of git://github.com/jacobhinkle/nixpkgs
Added sharedLibs option to ITK
This commit is contained in:
commit
645d54c35d
|
@ -1,14 +1,18 @@
|
||||||
{stdenv, fetchurl, cmake, libX11, libuuid, xz}:
|
{stdenv, fetchurl, cmake, libX11, libuuid, xz, sharedLibs ? false}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "itk-4.0.0";
|
name = "itk${stdenv.lib.optionalString sharedLibs ''-shared''}-4.0.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = mirror://sourceforge/itk/InsightToolkit-4.0.0.tar.xz;
|
url = mirror://sourceforge/itk/InsightToolkit-4.0.0.tar.xz;
|
||||||
sha256 = "05z49sw612cbyiaghcsda0xylrkf06jh81ql79si5632w1hpgbd9";
|
sha256 = "05z49sw612cbyiaghcsda0xylrkf06jh81ql79si5632w1hpgbd9";
|
||||||
};
|
};
|
||||||
|
|
||||||
cmakeFlags = [ "-DBUILD_TESTING=OFF" "-DBUILD_EXAMPLES=OFF" ];
|
cmakeFlags = [ "-DBUILD_TESTING=OFF" "-DBUILD_EXAMPLES=OFF" ]
|
||||||
|
++ stdenv.lib.optional sharedLibs [
|
||||||
|
"-DBUILD_SHARED_LIBS=ON"
|
||||||
|
"-DCMAKE_CXX_FLAGS=-fPIC"
|
||||||
|
];
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
|
|
@ -4569,6 +4569,8 @@ let
|
||||||
|
|
||||||
itk = callPackage ../development/libraries/itk { };
|
itk = callPackage ../development/libraries/itk { };
|
||||||
|
|
||||||
|
itkShared = itk.override { sharedLibs = true; };
|
||||||
|
|
||||||
jamp = builderDefsPackage ../games/jamp {
|
jamp = builderDefsPackage ../games/jamp {
|
||||||
inherit mesa SDL SDL_image SDL_mixer;
|
inherit mesa SDL SDL_image SDL_mixer;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue