Unverified Commit d9ee7a72 authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

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

parents b5d9b75f 6af61c93

pkgs/by-name/or/orthanc-framework/package.nix

+0 −4
Original line number Diff line number Diff line
@@ -18,10 +18,6 @@ stdenv.mkDerivation (finalAttrs: { 
    ;



  sourceRoot = "${finalAttrs.src.name}/OrthancFramework/SharedLibrary";

  outputs = [

    "out"

    "dev"

  ];



  buildInputs = orthanc.buildInputs ++ [

    icu

pkgs/by-name/or/orthanc-plugin-dicomweb/fix-orthanc-framework-headers-detection.patch

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
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()

pkgs/by-name/or/orthanc-plugin-dicomweb/package.nix

+1 −6
Original line number Diff line number Diff line
@@ -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 = {