git.iko.soy/typeable/nixpkgs
on master help sign in
gdcm: 3.0.8 -> 3.0.9 (#122654)

* gdcm: 3.0.8 -> 3.0.9 - make use of VTK optional (enabled by default) - use vtk instead of vtk_7 - fetching source code from GitHub (sourceforge doesn't have the last version). - nixpkgs-fmt * Update pkgs/development/libraries/gdcm/default.nix * Update pkgs/development/libraries/gdcm/default.nix Co-authored-by: Sandro <sandro.jaeckel@gmail.com>

commitb27eaa18b47b77fbbf9f3bd7a17046b2d64b637b authorThiago Franco de Moraes <totonixsame@gmail.com> dateTue 22 Jun 2021, 06:18 (5 years ago) parent1bbdca3
2 files changed+31−24
pkgs/development/libraries/gdcm/default.nix+28−23 pkgs/top-level/all-packages.nix+3−1
pkgs/development/libraries/gdcm/default.nix+28−23
@@ -1,40 +1,45 @@
1−{ lib, stdenv, fetchurl, cmake, vtk_7, darwin
2−, enablePython ? false, python ? null, swig ? null}:
1+{ lib
2+, stdenv
3+, fetchFromGitHub
4+, cmake
5+, enableVTK ? true
6+, vtk
7+, ApplicationServices
8+, Cocoa
9+, enablePython ? false
10+, python
11+, swig
12+}:
313
414stdenv.mkDerivation rec {
5− version = "3.0.8";
615 pname = "gdcm";
16+ version = "3.0.9";
717
8− src = fetchurl {
9− url = "mirror://sourceforge/gdcm/${pname}-${version}.tar.bz2";
10− sha256 = "1q9p0r7wszn51yak9wdp61fd9i0wj3f8ja2frmhk7d1gxic7j1rk";
18+ src = fetchFromGitHub {
19+ owner = "malaterre";
20+ repo = "GDCM";
21+ rev = "v${version}";
22+ sha256 = "sha256-wqrM8lxJM8VL+1QEdu6Gr1XWT1j9pT6gGd3yn1yokIY=";
1123 };
1224
13− dontUseCmakeBuildDir = true;
14−
1525 cmakeFlags = [
1626 "-DGDCM_BUILD_APPLICATIONS=ON"
1727 "-DGDCM_BUILD_SHARED_LIBS=ON"
28+ ] ++ lib.optionals enableVTK [
1829 "-DGDCM_USE_VTK=ON"
19− ]
20− ++ lib.optional enablePython [
30+ ] ++ lib.optionals enablePython [
2131 "-DGDCM_WRAP_PYTHON:BOOL=ON"
2232 "-DGDCM_INSTALL_PYTHONMODULE_DIR=${placeholder "out"}/${python.sitePackages}"
2333 ];
2434
25− preConfigure = ''
26− cmakeDir=$PWD
27− mkdir ../build
28− cd ../build
29− '';
30−
3135 nativeBuildInputs = [ cmake ];
32− buildInputs = [ vtk_7 ]
33− ++ lib.optional stdenv.isDarwin [
34− darwin.apple_sdk.frameworks.ApplicationServices
35− darwin.apple_sdk.frameworks.Cocoa
36− ] ++ lib.optional enablePython [ swig python ];
37− propagatedBuildInputs = [ ];
36+
37+ buildInputs = lib.optionals enableVTK [
38+ vtk
39+ ] ++ lib.optionals stdenv.isDarwin [
40+ ApplicationServices
41+ Cocoa
42+ ] ++ lib.optionals enablePython [ swig python ];
3843
3944 meta = with lib; {
4045 description = "The grassroots cross-platform DICOM implementation";
@@ -44,6 +49,6 @@ stdenv.mkDerivation rec {
4449 '';
4550 homepage = "http://gdcm.sourceforge.net/";
4651 license = with licenses; [ bsd3 asl20 ];
47− platforms = platforms.all;
52+ maintainers = with maintainers; [ tfmoraes ];
4853 };
4954}
pkgs/top-level/all-packages.nix+3−1
@@ -15107,7 +15107,9 @@ in
1510715107
1510815108 gdal_2 = callPackage ../development/libraries/gdal/2.4.nix { };
1510915109
15110− gdcm = callPackage ../development/libraries/gdcm { };
15110+ gdcm = callPackage ../development/libraries/gdcm {
15111+ inherit (darwin.apple_sdk.frameworks) ApplicationServices Cocoa;
15112+ };
1511115113
1511215114 ggz_base_libs = callPackage ../development/libraries/ggz_base_libs {};
1511315115