orthanc-plugin-dicomweb: remove custom patch, cleanup (#400396)

Changed files
+1 -26
pkgs
by-name
or
orthanc-framework
orthanc-plugin-dicomweb
-4
pkgs/by-name/or/orthanc-framework/package.nix
···
;
sourceRoot = "${finalAttrs.src.name}/OrthancFramework/SharedLibrary";
-
outputs = [
-
"out"
-
"dev"
-
];
buildInputs = orthanc.buildInputs ++ [
icu
···
;
sourceRoot = "${finalAttrs.src.name}/OrthancFramework/SharedLibrary";
buildInputs = orthanc.buildInputs ++ [
icu
-16
pkgs/by-name/or/orthanc-plugin-dicomweb/fix-orthanc-framework-headers-detection.patch
···
-
diff -r ad41d16f36b1 Resources/Orthanc/CMake/DownloadOrthancFramework.cmake
-
--- a/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake Fri Jan 17 12:24:54 2025 +0100
-
+++ b/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake Thu Mar 20 17:45:59 2025 +0100
-
@@ -552,9 +552,10 @@
-
set(ORTHANC_FRAMEWORK_INCLUDE_DIR ${ORTHANC_FRAMEWORK_ROOT})
-
else()
-
find_path(ORTHANC_FRAMEWORK_INCLUDE_DIR OrthancFramework.h
-
- /usr/include/orthanc-framework
-
- /usr/local/include/orthanc-framework
-
+ /usr/
-
+ /usr/local/
-
${ORTHANC_FRAMEWORK_ROOT}
-
+ PATH_SUFFIXES include include/orthanc-framework
-
)
-
endif()
-
···
+1 -6
pkgs/by-name/or/orthanc-plugin-dicomweb/package.nix
···
pugixml,
libuuid,
zlib,
-
pkg-config,
}:
let
···
rev = "OrthancDicomWeb-${finalAttrs.version}";
hash = "sha256-ee271Fcu8yi1gZpTWrCuqhsBdFcPR/JK/fsnJg8PwIc=";
};
-
-
patches = [
-
# Fix Orthanc Framework headers files detection
-
./fix-orthanc-framework-headers-detection.patch
-
];
postPatch = ''
mkdir -p ThirdPartyDownloads
···
"-DCMAKE_BUILD_TYPE=Release"
"-DSTATIC_BUILD=OFF"
"-DORTHANC_FRAMEWORK_SOURCE=system"
];
meta = {
···
pugixml,
libuuid,
zlib,
}:
let
···
rev = "OrthancDicomWeb-${finalAttrs.version}";
hash = "sha256-ee271Fcu8yi1gZpTWrCuqhsBdFcPR/JK/fsnJg8PwIc=";
};
postPatch = ''
mkdir -p ThirdPartyDownloads
···
"-DCMAKE_BUILD_TYPE=Release"
"-DSTATIC_BUILD=OFF"
"-DORTHANC_FRAMEWORK_SOURCE=system"
+
"-DORTHANC_FRAMEWORK_ROOT=${orthanc.framework}/include/orthanc-framework"
];
meta = {