From f5edf3244f0eb88165d18982a8d11266d65839c2 Mon Sep 17 00:00:00 2001 From: Jacob Hinkle Date: Fri, 14 Mar 2014 16:28:49 -0600 Subject: [PATCH] Added sharedLibs option to ITK --- pkgs/development/libraries/itk/default.nix | 10 +++++++--- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/itk/default.nix b/pkgs/development/libraries/itk/default.nix index bfe10490fc7..478cc4a3864 100644 --- a/pkgs/development/libraries/itk/default.nix +++ b/pkgs/development/libraries/itk/default.nix @@ -1,14 +1,18 @@ -{stdenv, fetchurl, cmake, libX11, libuuid, xz}: +{stdenv, fetchurl, cmake, libX11, libuuid, xz, sharedLibs ? false}: stdenv.mkDerivation rec { - name = "itk-4.0.0"; + name = "itk${stdenv.lib.optionalString sharedLibs ''-shared''}-4.0.0"; src = fetchurl { url = mirror://sourceforge/itk/InsightToolkit-4.0.0.tar.xz; 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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 987d94029d0..1b81f9c1381 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4567,6 +4567,8 @@ let itk = callPackage ../development/libraries/itk { }; + itkShared = itk.override { sharedLibs = true; }; + jamp = builderDefsPackage ../games/jamp { inherit mesa SDL SDL_image SDL_mixer; };