From ab8ef860868be691c6c3ae966a22dcd3827fbbae Mon Sep 17 00:00:00 2001 From: Augustin Trancart Date: Wed, 22 Jan 2025 15:41:56 +0100 Subject: [PATCH] kio-extras, kio-extras-kf5: switch to openexr_3 --- pkgs/applications/kde/kio-extras.nix | 6 ++---- pkgs/kde/gear/kio-extras/default.nix | 4 ++-- pkgs/kde/misc/kio-extras-kf5/default.nix | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/kde/kio-extras.nix b/pkgs/applications/kde/kio-extras.nix index 21738a1ac142..91d80677bb16 100644 --- a/pkgs/applications/kde/kio-extras.nix +++ b/pkgs/applications/kde/kio-extras.nix @@ -24,9 +24,8 @@ syntax-highlighting, libmtp, libssh, - openexr, + openexr_3, libtirpc, - ilmbase, phonon, qtsvg, samba, @@ -72,7 +71,7 @@ mkDerivation { syntax-highlighting libmtp libssh - openexr + openexr_3 libtirpc phonon qtsvg @@ -90,5 +89,4 @@ mkDerivation { --replace Exec=$out Exec=${kio} ''; - CXXFLAGS = [ "-I${ilmbase.dev}/include/OpenEXR" ]; } diff --git a/pkgs/kde/gear/kio-extras/default.nix b/pkgs/kde/gear/kio-extras/default.nix index 2260feeac62c..0e3702ce7360 100644 --- a/pkgs/kde/gear/kio-extras/default.nix +++ b/pkgs/kde/gear/kio-extras/default.nix @@ -9,7 +9,7 @@ libimobiledevice, gperf, libtirpc, - openexr, + openexr_3, taglib, shared-mime-info, libappimage, @@ -34,7 +34,7 @@ mkKdeDerivation { libimobiledevice gperf libtirpc - openexr + openexr_3 taglib libappimage xorg.libXcursor diff --git a/pkgs/kde/misc/kio-extras-kf5/default.nix b/pkgs/kde/misc/kio-extras-kf5/default.nix index 886ae1a62777..add6b08de399 100644 --- a/pkgs/kde/misc/kio-extras-kf5/default.nix +++ b/pkgs/kde/misc/kio-extras-kf5/default.nix @@ -10,7 +10,7 @@ libimobiledevice, gperf, libtirpc, - openexr, + openexr_3, taglib, libappimage, }: @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { libimobiledevice gperf libtirpc - openexr + openexr_3 taglib libappimage ];