From d1e88c462587647675089a8b9270b2861833006c Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 14 Mar 2014 20:18:17 -0400 Subject: [PATCH] Unconditionally compile itk with shared libs --- pkgs/development/libraries/itk/default.nix | 13 +++++++------ pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/itk/default.nix b/pkgs/development/libraries/itk/default.nix index 478cc4a38647..29e15e08f696 100644 --- a/pkgs/development/libraries/itk/default.nix +++ b/pkgs/development/libraries/itk/default.nix @@ -1,17 +1,18 @@ -{stdenv, fetchurl, cmake, libX11, libuuid, xz, sharedLibs ? false}: +{stdenv, fetchurl, cmake, libX11, libuuid, xz}: stdenv.mkDerivation rec { - name = "itk${stdenv.lib.optionalString sharedLibs ''-shared''}-4.0.0"; + name = "itk-4.0.0"; src = fetchurl { url = mirror://sourceforge/itk/InsightToolkit-4.0.0.tar.xz; sha256 = "05z49sw612cbyiaghcsda0xylrkf06jh81ql79si5632w1hpgbd9"; }; - cmakeFlags = [ "-DBUILD_TESTING=OFF" "-DBUILD_EXAMPLES=OFF" ] - ++ stdenv.lib.optional sharedLibs [ - "-DBUILD_SHARED_LIBS=ON" - "-DCMAKE_CXX_FLAGS=-fPIC" + cmakeFlags = [ + "-DBUILD_TESTING=OFF" + "-DBUILD_EXAMPLES=OFF" + "-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 a4035f128fb8..9aaa55496e21 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4569,8 +4569,6 @@ let itk = callPackage ../development/libraries/itk { }; - itkShared = itk.override { sharedLibs = true; }; - jamp = builderDefsPackage ../games/jamp { inherit mesa SDL SDL_image SDL_mixer; };