diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-11-14 13:16:25 +0100 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-11-14 13:16:34 +0100 |
| commit | 3c336a1647ada0970b71284cceb601c3d79c2134 (patch) | |
| tree | dea9a6a0eb8673bf86ce7d114b09688d11356a46 /pkgs/development/libraries/gdcm | |
| parent | 2605fad79520679232edcf4de591013d7b34b0a5 (diff) | |
| parent | bf744fe90419885eefced41b3e5ae442d732712d (diff) | |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: - pkgs/development/libraries/gdcm/default.nix
Diffstat (limited to 'pkgs/development/libraries/gdcm')
| -rw-r--r-- | pkgs/development/libraries/gdcm/default.nix | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index 2c6454e3242d0..3298be5cc3cc3 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -10,6 +10,11 @@ , enablePython ? false , python ? null , swig4 +, expat +, libuuid +, openjpeg +, zlib +, pkg-config }: stdenv.mkDerivation rec { @@ -27,6 +32,10 @@ stdenv.mkDerivation rec { "-DGDCM_BUILD_APPLICATIONS=ON" "-DGDCM_BUILD_SHARED_LIBS=ON" "-DGDCM_BUILD_TESTING=ON" + "-DGDCM_USE_SYSTEM_EXPAT=ON" + "-DGDCM_USE_SYSTEM_ZLIB=ON" + "-DGDCM_USE_SYSTEM_UUID=ON" + "-DGDCM_USE_SYSTEM_OPENJPEG=ON" # hack around usual "`RUNTIME_DESTINATION` must not be an absolute path" issue: "-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_BINDIR=bin" @@ -38,9 +47,17 @@ stdenv.mkDerivation rec { "-DGDCM_INSTALL_PYTHONMODULE_DIR=${placeholder "out"}/${python.sitePackages}" ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; - buildInputs = lib.optionals enableVTK [ + buildInputs = [ + expat + libuuid + openjpeg + zlib + ] ++ lib.optionals enableVTK [ vtk ] ++ lib.optionals stdenv.isDarwin [ ApplicationServices |