public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unconditionally compile itk with shared libs

Browse Source
This commit is contained in:
Shea Levy 2014-03-14 20:18:17 -04:00
parent 645d54c35d
commit d1e88c4625
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/libraries/itk/default.nix
View File

@ -1,17 +1,18 @@
{stdenv, fetchurl, cmake, libX11, libuuid, xz, sharedLibs ? false}: {stdenv, fetchurl, cmake, libX11, libuuid, xz}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "itk${stdenv.lib.optionalString sharedLibs ''-shared''}-4.0.0"; name = "itk-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 = [
++ stdenv.lib.optional sharedLibs [ "-DBUILD_TESTING=OFF"
"-DBUILD_SHARED_LIBS=ON" "-DBUILD_EXAMPLES=OFF"
"-DCMAKE_CXX_FLAGS=-fPIC" "-DBUILD_SHARED_LIBS=ON"
"-DCMAKE_CXX_FLAGS=-fPIC"
]; ];
enableParallelBuilding = true; enableParallelBuilding = true;

2
pkgs/top-level/all-packages.nix
View File

@ -4569,8 +4569,6 @@ 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;
}; };