Unverified Commit 9c81fd51 authored by K900's avatar K900 Committed by GitHub
Browse files

treewide: fix (some of) the ilmbase fallout (#505471)

parents 437e1627 d15d04c7
Loading
Loading
Loading
Loading
+0 −2
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@
  exiftool,
  mimalloc,
  openexr,
  ilmbase,
  opencolorio,
  color-transformation-language,
}:
@@ -92,7 +91,6 @@ stdenv.mkDerivation (finalAttrs: {
    libcanberra-gtk3
    mimalloc
    openexr
    ilmbase
    opencolorio
    color-transformation-language
  ];
+2 −2
Original line number Diff line number Diff line
@@ -25,12 +25,12 @@
  gtest,
  gtk3,
  hicolor-icon-theme,
  ilmbase,
  libpng,
  mpfr,
  nlopt,
  opencascade-occt_7_6,
  openvdb,
  openexr,
  opencv,
  pcre,
  systemd,
@@ -94,11 +94,11 @@ stdenv.mkDerivation (finalAttrs: {
    gst_all_1.gst-plugins-good
    gtk3
    hicolor-icon-theme
    ilmbase
    libpng
    mpfr
    nlopt
    opencascade-occt_7_6
    openexr
    openvdb
    pcre
    onetbb
+0 −2
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@
  stdenv,
  fetchFromGitHub,
  cmake,
  ilmbase,
  openexr,
  libtiff,
  aces-container,
@@ -22,7 +21,6 @@ stdenv.mkDerivation (finalAttrs: {

  nativeBuildInputs = [
    cmake
    ilmbase
    openexr
    libtiff
    aces-container
+1 −3
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@
  graphicsmagick,
  gtk3,
  icu,
  ilmbase,
  isocodes,
  jasper,
  json-glib,
@@ -114,7 +113,6 @@ stdenv.mkDerivation rec {
    graphicsmagick
    gtk3
    icu
    ilmbase
    isocodes
    jasper
    json-glib
@@ -122,7 +120,7 @@ stdenv.mkDerivation rec {
    lensfun
    lerc
    libaom
    #libavif # TODO re-enable once cmake files are fixed (#425306)
    libavif
    libdatrie
    libepoxy
    libexif
+3 −2
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@
  gtest,
  gtk3,
  hicolor-icon-theme,
  ilmbase,
  libsecret,
  libpng,
  mpfr,
@@ -111,7 +110,6 @@ stdenv.mkDerivation (finalAttrs: {
    gst_all_1.gst-plugins-good
    gtk3
    hicolor-icon-theme
    ilmbase
    libsecret
    libpng
    mpfr
@@ -141,6 +139,9 @@ stdenv.mkDerivation (finalAttrs: {
      url = "https://github.com/SoftFever/OrcaSlicer/commit/d10a06ae11089cd1f63705e87f558e9392f7a167.patch";
      hash = "sha256-t4own5AwPsLYBsGA15id5IH1ngM0NSuWdFsrxMRXmTk=";
    })

    # Pick https://github.com/prusa3d/PrusaSlicer/pull/14207 to remove unused and insecure ilmbase dependency
    ./patches/no-ilmbase.patch
  ];

  doCheck = true;
Loading