From 5480a29dba1ecf700e774a23dfb3d4ea3068f9f0 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Thu, 30 Mar 2023 12:39:15 +0300 Subject: [PATCH] gst_all_1.gst-plugins-bad: try grafting opencv4 to avoid rebuilds trigged by cudaSupport --- .../libraries/gstreamer/default.nix | 21 +++++++++++++++++-- pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix index 69ee36149776d..a413c2bb70405 100644 --- a/pkgs/development/libraries/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/default.nix @@ -1,4 +1,9 @@ -{ callPackage, AudioToolbox, AVFoundation, Cocoa, CoreFoundation, CoreMedia, CoreServices, CoreVideo, DiskArbitration, Foundation, IOKit, MediaToolbox, OpenGL, VideoToolbox }: +{ callPackage, AudioToolbox, AVFoundation, Cocoa, CoreFoundation, CoreMedia, CoreServices, CoreVideo, DiskArbitration, Foundation, IOKit, MediaToolbox, OpenGL, VideoToolbox, +replaceDependency, +opencv4WithoutOverrides, +opencv4, +graftOpenCV ? true +}: { gstreamer = callPackage ./core { inherit CoreServices; }; @@ -9,7 +14,19 @@ gst-plugins-good = callPackage ./good { inherit Cocoa; }; - gst-plugins-bad = callPackage ./bad { inherit AudioToolbox AVFoundation CoreMedia CoreVideo Foundation MediaToolbox VideoToolbox; }; + gst-plugins-bad = + let + original = callPackage ./bad { + inherit AudioToolbox AVFoundation CoreMedia CoreVideo Foundation MediaToolbox VideoToolbox; + opencv4 = opencv4WithoutOverrides; + }; + grafted = replaceDependency { + drv = original; + oldDependency = opencv4WithoutOverrides; + newDependency = opencv4; + }; + in + grafted; gst-plugins-ugly = callPackage ./ugly { inherit CoreFoundation DiskArbitration IOKit; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 31d9afd3d3b3f..f5886e2de8200 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22879,6 +22879,10 @@ with pkgs; ffmpeg = ffmpeg_4; }; + opencv4WithoutOverrides = opencv4.override { + config = { }; + }; + opencv = opencv4; imath = callPackage ../development/libraries/imath { };