Unverified Commit cca1b4f9 authored by Ben Siraphob's avatar Ben Siraphob Committed by GitHub
Browse files

Merge pull request #206265 from StillerHarpo/dcmtk

parents b111b338 5d2936b3
Loading
Loading
Loading
Loading
+12 −0
Original line number Diff line number Diff line
diff --git a/CMake/dcmtk.pc.in b/CMake/dcmtk.pc.in
index 13c79c0d5..b1edf725c 100644
--- a/CMake/dcmtk.pc.in
+++ b/CMake/dcmtk.pc.in
@@ -1,6 +1,6 @@
  prefix="@CMAKE_INSTALL_PREFIX@"
  exec_prefix="${prefix}"
- libdir="${prefix}/@CMAKE_INSTALL_LIBDIR@"
+ libdir=@CMAKE_INSTALL_FULL_LIBDIR@"
  includedir="${prefix}/include/"
 
  Name: DCMTK
+7 −2
Original line number Diff line number Diff line
{ lib, stdenv, fetchFromGitHub, zlib, libtiff, libxml2, openssl, libiconv, libpng, cmake }:
{ lib, stdenv, fetchFromGitHub, zlib, libtiff, libxml2, openssl, libiconv
, libpng, cmake, fetchpatch }:

with lib;
stdenv.mkDerivation rec {
@@ -14,8 +15,12 @@ stdenv.mkDerivation rec {
  nativeBuildInputs = [ cmake ];
  buildInputs = [ libpng zlib libtiff libxml2 openssl libiconv ];

  # This is only needed until https://github.com/DCMTK/dcmtk/pull/75/files is merged
  patches = [ ./0001-Fix-cmake.patch ];

  meta = {
    description = "Collection of libraries and applications implementing large parts of the DICOM standard";
    description =
      "Collection of libraries and applications implementing large parts of the DICOM standard";
    longDescription = ''
      DCMTK is a collection of libraries and applications implementing large parts of the DICOM standard.
      It includes software for examining, constructing and converting DICOM image files, handling offline media,