diff --git a/pkgs/by-name/or/orthanc-framework/package.nix b/pkgs/by-name/or/orthanc-framework/package.nix index 037044b68a6f..e19bd8331e79 100644 --- a/pkgs/by-name/or/orthanc-framework/package.nix +++ b/pkgs/by-name/or/orthanc-framework/package.nix @@ -18,10 +18,6 @@ stdenv.mkDerivation (finalAttrs: { ; sourceRoot = "${finalAttrs.src.name}/OrthancFramework/SharedLibrary"; - outputs = [ - "out" - "dev" - ]; buildInputs = orthanc.buildInputs ++ [ icu diff --git a/pkgs/by-name/or/orthanc-plugin-dicomweb/fix-orthanc-framework-headers-detection.patch b/pkgs/by-name/or/orthanc-plugin-dicomweb/fix-orthanc-framework-headers-detection.patch deleted file mode 100644 index 87c92ed94d1b..000000000000 --- a/pkgs/by-name/or/orthanc-plugin-dicomweb/fix-orthanc-framework-headers-detection.patch +++ /dev/null @@ -1,16 +0,0 @@ -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() - diff --git a/pkgs/by-name/or/orthanc-plugin-dicomweb/package.nix b/pkgs/by-name/or/orthanc-plugin-dicomweb/package.nix index 160d7bb47949..40e0cdf16ce1 100644 --- a/pkgs/by-name/or/orthanc-plugin-dicomweb/package.nix +++ b/pkgs/by-name/or/orthanc-plugin-dicomweb/package.nix @@ -13,7 +13,6 @@ pugixml, libuuid, zlib, - pkg-config, }: let @@ -48,11 +47,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-ee271Fcu8yi1gZpTWrCuqhsBdFcPR/JK/fsnJg8PwIc="; }; - patches = [ - # Fix Orthanc Framework headers files detection - ./fix-orthanc-framework-headers-detection.patch - ]; - postPatch = '' mkdir -p ThirdPartyDownloads ln -s ${bootstrap} ThirdPartyDownloads/bootstrap-5.3.3.zip @@ -92,6 +86,7 @@ stdenv.mkDerivation (finalAttrs: { "-DCMAKE_BUILD_TYPE=Release" "-DSTATIC_BUILD=OFF" "-DORTHANC_FRAMEWORK_SOURCE=system" + "-DORTHANC_FRAMEWORK_ROOT=${orthanc.framework}/include/orthanc-framework" ]; meta = {