opencv4: drop gtk2 support for highgui
This commit is contained in:
@@ -9,7 +9,6 @@
|
||||
|
||||
let
|
||||
opencv4WithGtk = python3Packages.opencv4.override {
|
||||
enableGtk2 = true; # For GTK2 support
|
||||
enableGtk3 = true; # For GTK3 support
|
||||
};
|
||||
in
|
||||
|
||||
@@ -54,8 +54,6 @@
|
||||
enableIpp ? false,
|
||||
enablePython ? false,
|
||||
pythonPackages,
|
||||
enableGtk2 ? false,
|
||||
gtk2,
|
||||
enableGtk3 ? false,
|
||||
gtk3,
|
||||
enableVtk ? false,
|
||||
@@ -360,9 +358,6 @@ effectiveStdenv.mkDerivation {
|
||||
++ optionals (effectiveStdenv.buildPlatform == effectiveStdenv.hostPlatform) [
|
||||
hdf5
|
||||
]
|
||||
++ optionals enableGtk2 [
|
||||
gtk2
|
||||
]
|
||||
++ optionals enableGtk3 [
|
||||
gtk3
|
||||
]
|
||||
@@ -649,7 +644,6 @@ effectiveStdenv.mkDerivation {
|
||||
opencv4-tests = callPackage ./tests.nix {
|
||||
inherit
|
||||
enableGStreamer
|
||||
enableGtk2
|
||||
enableGtk3
|
||||
runAccuracyTests
|
||||
runPerformanceTests
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
{
|
||||
enableGStreamer,
|
||||
enableGtk2,
|
||||
enableGtk3,
|
||||
gst_all_1,
|
||||
lib,
|
||||
@@ -76,7 +75,7 @@ runCommand "opencv4-tests"
|
||||
#"dnn" #- some caffe tests failed, probably because github workflow also downloads additional models
|
||||
]
|
||||
++ optionals (!isAarch64 && enableGStreamer) [ "gapi" ]
|
||||
++ optionals (enableGtk2 || enableGtk3) [ "highgui" ];
|
||||
++ optionals enableGtk3 [ "highgui" ];
|
||||
|
||||
inherit runPerformanceTests;
|
||||
|
||||
|
||||
@@ -3140,7 +3140,7 @@ let
|
||||
opencv =
|
||||
let
|
||||
opencvGtk = pkgs.opencv.override (old: {
|
||||
enableGtk2 = true;
|
||||
enableGtk3 = true;
|
||||
});
|
||||
in
|
||||
old.opencv.overrideAttrs (attrs: {
|
||||
|
||||
@@ -12235,7 +12235,6 @@ self: super: with self; {
|
||||
enableLto = !stdenv.hostPlatform.isLinux; # https://github.com/NixOS/nixpkgs/issues/343123
|
||||
enableUnfree = false; # prevents cache
|
||||
enableIpp = true;
|
||||
enableGtk2 = true;
|
||||
enableGtk3 = true;
|
||||
enableVtk = true;
|
||||
enableFfmpeg = true;
|
||||
|
||||
Reference in New Issue
Block a user