Merge pull request #279239 from LeSuisse/dcmtk-3.6.8

dcmtk: 3.6.7 -> 3.6.8
This commit is contained in:
Robert Scott 2024-01-08 19:36:33 +00:00 committed by GitHub
commit d2415e5194
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 17 deletions

View file

@ -1,12 +0,0 @@
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

View file

@ -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 = {