Unverified Commit d2415e51 authored by Robert Scott's avatar Robert Scott Committed by GitHub
Browse files

Merge pull request #279239 from LeSuisse/dcmtk-3.6.8

dcmtk: 3.6.7 -> 3.6.8
parents f127ed25 d99ca3f1
Loading
Loading
Loading
Loading
+0 −12
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
+2 −5
Original line number Diff line number Diff line
@@ -4,20 +4,17 @@
with lib;
stdenv.mkDerivation rec {
  pname = "dcmtk";
  version = "3.6.7";
  version = "3.6.8";
  src = fetchFromGitHub {
    owner = "DCMTK";
    repo = pname;
    rev = "DCMTK-${version}";
    sha256 = "sha256-Pw99R6oGcLX6Z7s8ZnpbBBqcIvY9Rl/nw2PVGjpD3gY=";
    hash = "sha256-PQR9+xSlfBvogv0p6AL/yapelJpsYteA4T4lPkOIfLc=";
  };

  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 ];

  doCheck = true;

  meta = {